diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index c50e96b2429075f09fb3e42de2516a8fa4d67cf6..f1b713b55346714907d6da144d1cb92dc6b36bc2 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -10,35 +10,38 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+
+if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
+ header("HTTP/1.0 404 Not Found");
+ exit();
+}
+
$doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
+$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
+
+$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = array();
- $pathtohere = "/";
- foreach( explode( "/", $dir ) as $i ) {
- if( $i != "" ) {
- $pathtohere .= "$i/";
- $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
- }
- }
-
- $breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
- $breadcrumbNav->assign( "breadcrumb", $breadcrumb, false );
+ $breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+
+ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+ $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+ $breadcrumbNav->assign('baseURL', $baseUrl);
$data['breadcrumb'] = $breadcrumbNav->fetchPage();
}
// make filelist
-$files = array();
-foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $files[] = $i;
-}
-
-$list = new OCP\Template( "files", "part.list", "" );
-$list->assign( "files", $files, false );
-$data = array('files' => $list->fetchPage());
+$files = \OCA\files\lib\Helper::getFiles($dir);
+
+$list = new OCP\Template("files", "part.list", "");
+$list->assign('files', $files, false);
+$list->assign('baseURL', $baseUrl, false);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
+$list->assign('isPublic', false);
+$data['files'] = $list->fetchPage();
+$data['permissions'] = $permissions;
OCP\JSON::success(array('data' => $data));
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index f568afad4da44f87f4d74cd301cee93202c8aa9b..802a308353360893542fc35e2c5bbbea66bea6c8 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -11,22 +11,54 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
+$mimetypes = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes'], true) : '';
+
+// Clean up duplicates from array and deal with non-array requests
+if (is_array($mimetypes)) {
+ $mimetypes = array_unique($mimetypes);
+} elseif (is_null($mimetypes)) {
+ $mimetypes = array($_GET['mimetypes']);
+}
// make filelist
$files = array();
// If a type other than directory is requested first load them.
-if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
- foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
- $files[] = $i;
+if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $files[] = $file;
}
}
-foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
- $files[] = $i;
+
+if (is_array($mimetypes) && count($mimetypes)) {
+ foreach ($mimetypes as $mimetype) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $files[] = $file;
+ }
+ }
+} else {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $files[] = $file;
+ }
}
-OCP\JSON::success(array('data' => $files));
+// Sort by name
+usort($files, function ($a, $b) {
+ if ($a['name'] === $b['name']) {
+ return 0;
+ }
+ return ($a['name'] < $b['name']) ? -1 : 1;
+});
+
+OC_JSON::success(array('data' => $files));
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 02a73ba83e518ef2c377c2164c8f7f49dac1134b..41d9808c56b28be68b20d67151c7dd826e25f528 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -69,11 +69,11 @@
/* FILE TABLE */
#filestable { position: relative; top:37px; width:100%; }
-tbody tr { background-color:#fff; height:2.5em; }
-tbody tr:hover, tbody tr:active {
+#filestable tbody tr { background-color:#fff; height:2.5em; }
+#filestable tbody tr:hover, tbody tr:active {
background-color: rgb(240,240,240);
}
-tbody tr.selected {
+#filestable tbody tr.selected {
background-color: rgb(230,230,230);
}
tbody a { color:#000; }
@@ -190,10 +190,15 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
#fileList tr:hover td.filename>input[type="checkbox"]:first-child,
#fileList tr td.filename>input[type="checkbox"]:checked:first-child,
#fileList tr.selected td.filename>input[type="checkbox"]:first-child {
+ opacity: 1;
+}
+.lte9 #fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+.lte9 #fileList tr td.filename>input[type="checkbox"][checked=checked]:first-child,
+.lte9 #fileList tr.selected td.filename>input[type="checkbox"]:first-child {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
- opacity: 1;
}
+
/* Use label to have bigger clickable size for checkbox */
#fileList tr td.filename>input[type="checkbox"] + label,
#select_all + label {
@@ -331,3 +336,25 @@ table.dragshadow td.size {
text-align: center;
margin-left: -200px;
}
+.mask {
+ z-index: 50;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: white;
+ background-repeat: no-repeat no-repeat;
+ background-position: 50%;
+ opacity: 0.7;
+ filter: alpha(opacity=70);
+ transition: opacity 100ms;
+ -moz-transition: opacity 100ms;
+ -o-transition: opacity 100ms;
+ -ms-transition: opacity 100ms;
+ -webkit-transition: opacity 100ms;
+}
+.mask.transparent{
+ opacity: 0;
+}
+
diff --git a/apps/files/index.php b/apps/files/index.php
index f1e120c872cf55f29668414962b3184a5b8536e6..d46d8e32eefcce1cc08cd502a4b016bde1a63418 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -41,79 +41,58 @@ if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
exit();
}
-function fileCmp($a, $b) {
- if ($a['type'] == 'dir' and $b['type'] != 'dir') {
- return -1;
- } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
- return 1;
- } else {
- return strnatcasecmp($a['name'], $b['name']);
+$isIE8 = false;
+preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+if (count($matches) > 0 && $matches[1] <= 8){
+ $isIE8 = true;
+}
+
+// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
+if ($isIE8 && isset($_GET['dir'])){
+ if ($dir === ''){
+ $dir = '/';
}
+ header('Location: ' . OCP\Util::linkTo('files', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+ exit();
}
+$ajaxLoad = false;
$files = array();
$user = OC_User::getUser();
if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache
- $content = array();
$needUpgrade = true;
$freeSpace = 0;
} else {
- $content = \OC\Files\Filesystem::getDirectoryContent($dir);
+ if ($isIE8){
+ // after the redirect above, the URL will have a format
+ // like "files#?dir=path" which means that no path was given
+ // (dir is not set). In that specific case, we don't return any
+ // files because the client will take care of switching the dir
+ // to the one from the hash, then ajax-load the initial file list
+ $files = array();
+ $ajaxLoad = true;
+ }
+ else{
+ $files = \OCA\files\lib\Helper::getFiles($dir);
+ }
$freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false;
}
-foreach ($content as $i) {
- $i['date'] = OCP\Util::formatDate($i['mtime']);
- if ($i['type'] == 'file') {
- $fileinfo = pathinfo($i['name']);
- $i['basename'] = $fileinfo['filename'];
- if (!empty($fileinfo['extension'])) {
- $i['extension'] = '.' . $fileinfo['extension'];
- } else {
- $i['extension'] = '';
- }
- }
- $i['directory'] = $dir;
- $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
- $files[] = $i;
-}
-
-usort($files, "fileCmp");
// Make breadcrumb
-$breadcrumb = array();
-$pathtohere = '';
-foreach (explode('/', $dir) as $i) {
- if ($i != '') {
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
- }
-}
+$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
// make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files);
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
-$list->assign('disableSharing', false);
$list->assign('isPublic', false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$permissions = OCP\PERMISSION_READ;
-if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
- $permissions |= OCP\PERMISSION_CREATE;
-}
-if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
- $permissions |= OCP\PERMISSION_UPDATE;
-}
-if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
- $permissions |= OCP\PERMISSION_DELETE;
-}
-if (\OC\Files\Filesystem::isSharable($dir . '/')) {
- $permissions |= OCP\PERMISSION_SHARE;
-}
+$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');
@@ -153,5 +132,7 @@ if ($needUpgrade) {
$tmpl->assign('isPublic', false);
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
+ $tmpl->assign('disableSharing', false);
+ $tmpl->assign('ajaxLoad', $ajaxLoad);
$tmpl->printPage();
}
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 3d620c5640b3dcf76272f2e6ede3e9c5cb68455b..aeb2da90d5fc0bb043a5ed5d18e1a8b19172555a 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -46,6 +46,15 @@ $(document).ready(function() {
$('#uploadprogresswrapper input.stop').show();
}
},
+ submit: function(e, data) {
+ if ( ! data.formData ) {
+ // noone set update parameters, we set the minimum
+ data.formData = {
+ requesttoken: oc_requesttoken,
+ dir: $('#dir').val()
+ };
+ }
+ },
/**
* called after the first add, does NOT have the data param
* @param e
@@ -141,15 +150,8 @@ $(document).ready(function() {
$('#uploadprogressbar').fadeOut();
}
};
- var file_upload_handler = function() {
- $('#file_upload_start').fileupload(file_upload_param);
- };
-
-
-
- if ( document.getElementById('data-upload-form') ) {
- $(file_upload_handler);
- }
+ $('#file_upload_start').fileupload(file_upload_param);
+
$.assocArraySize = function(obj) {
// http://stackoverflow.com/a/6700/11236
var size = 0, key;
@@ -344,8 +346,12 @@ $(document).ready(function() {
}
var li=form.parent();
form.remove();
+ /* workaround for IE 9&10 click event trap, 2 lines: */
+ $('input').first().focus();
+ $('#content').focus();
li.append('<p>'+li.data('text')+'</p>');
$('#new>a').click();
});
});
+ window.file_upload_param = file_upload_param;
});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 097fe521aa63e767b375f43e22f3e5a283a5c05d..330fe86f6b3d7a3b0116532be362b273842710a4 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -196,13 +196,12 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
FileList.rename(filename);
});
-
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
- var dir = $('#dir').val();
+ var dir = $('#dir').val() || '/';
if (dir !== '/') {
dir = dir + '/';
}
- window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
+ FileList.changeDirectory(dir + filename);
});
FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 29be5e0d3625d9c1d31e68e7cad5a9795d7e5199..b50d46c98d3072ef0fffcaa7e3bb23166266e93d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1,7 +1,28 @@
var FileList={
useUndo:true,
+ postProcessList: function(){
+ $('#fileList tr').each(function(){
+ //little hack to set unescape filenames in attribute
+ $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
+ });
+ },
update:function(fileListHtml) {
- $('#fileList').empty().html(fileListHtml);
+ var $fileList = $('#fileList'),
+ permissions = $('#permissions').val(),
+ isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ $fileList.empty().html(fileListHtml);
+ $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
+ $fileList.find('tr').each(function () {
+ FileActions.display($(this).children('td.filename'));
+ });
+ $fileList.trigger(jQuery.Event("fileActionsReady"));
+ FileList.postProcessList();
+ // "Files" might not be loaded in extending apps
+ if (window.Files){
+ Files.setupDragAndDrop();
+ }
+ FileList.updateFileSummary();
+ $fileList.trigger(jQuery.Event("updated"));
},
createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions){
var td, simpleSize, basename, extension;
@@ -134,20 +155,109 @@ var FileList={
FileActions.display(tr.find('td.filename'));
return tr;
},
- refresh:function(data) {
- var result = jQuery.parseJSON(data.responseText);
+ /**
+ * @brief Changes the current directory and reload the file list.
+ * @param targetDir target directory (non URL encoded)
+ * @param changeUrl false if the URL must not be changed (defaults to true)
+ */
+ changeDirectory: function(targetDir, changeUrl, force){
+ var $dir = $('#dir'),
+ url,
+ currentDir = $dir.val() || '/';
+ targetDir = targetDir || '/';
+ if (!force && currentDir === targetDir){
+ return;
+ }
+ FileList.setCurrentDir(targetDir, changeUrl);
+ FileList.reload();
+ },
+ linkTo: function(dir){
+ return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+ },
+ setCurrentDir: function(targetDir, changeUrl){
+ $('#dir').val(targetDir);
+ if (changeUrl !== false){
+ if (window.history.pushState && changeUrl !== false){
+ url = FileList.linkTo(targetDir);
+ window.history.pushState({dir: targetDir}, '', url);
+ }
+ // use URL hash for IE8
+ else{
+ window.location.hash = '?dir='+ encodeURIComponent(targetDir).replace(/%2F/g, '/');
+ }
+ }
+ },
+ /**
+ * @brief Reloads the file list using ajax call
+ */
+ reload: function(){
+ FileList.showMask();
+ if (FileList._reloadCall){
+ FileList._reloadCall.abort();
+ }
+ FileList._reloadCall = $.ajax({
+ url: OC.filePath('files','ajax','list.php'),
+ data: {
+ dir : $('#dir').val(),
+ breadcrumb: true
+ },
+ error: function(result){
+ FileList.reloadCallback(result);
+ },
+ success: function(result) {
+ FileList.reloadCallback(result);
+ }
+ });
+ },
+ reloadCallback: function(result){
+ var $controls = $('#controls');
+
+ delete FileList._reloadCall;
+ FileList.hideMask();
+
+ if (!result || result.status === 'error') {
+ OC.Notification.show(result.data.message);
+ return;
+ }
+
+ if (result.status === 404){
+ // go back home
+ FileList.changeDirectory('/');
+ return;
+ }
+
+ if (result.data.permissions){
+ FileList.setDirectoryPermissions(result.data.permissions);
+ }
+
if(typeof(result.data.breadcrumb) != 'undefined'){
- updateBreadcrumb(result.data.breadcrumb);
+ $controls.find('.crumb').remove();
+ $controls.prepend(result.data.breadcrumb);
+
+ var width = $(window).width();
+ Files.initBreadCrumbs();
+ Files.resizeBreadcrumbs(width, true);
+
+ // in case svg is not supported by the browser we need to execute the fallback mechanism
+ if(!SVGSupport()) {
+ replaceSVG();
+ }
}
+
FileList.update(result.data.files);
- resetFileActionPanel();
+ },
+ setDirectoryPermissions: function(permissions){
+ var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ $('#permissions').val(permissions);
+ $('.creatable').toggleClass('hidden', !isCreatable);
+ $('.notCreatable').toggleClass('hidden', isCreatable);
},
remove:function(name){
$('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
$('tr').filterAttr('data-file',name).remove();
FileList.updateFileSummary();
if($('tr[data-file]').length==0){
- $('#emptycontent').show();
+ $('#emptycontent').removeClass('hidden');
}
},
insertElement:function(name,type,element){
@@ -177,7 +287,7 @@ var FileList={
}else{
$('#fileList').append(element);
}
- $('#emptycontent').hide();
+ $('#emptycontent').addClass('hidden');
FileList.updateFileSummary();
},
loadingDone:function(name, id){
@@ -508,6 +618,31 @@ var FileList={
$connector.show();
}
}
+ },
+ showMask: function(){
+ // in case one was shown before
+ var $mask = $('#content .mask');
+ if ($mask.length){
+ return;
+ }
+
+ $mask = $('<div class="mask transparent"></div>');
+
+ $mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ $mask.css('background-repeat', 'no-repeat');
+ $('#content').append($mask);
+
+ // block UI, but only make visible in case loading takes longer
+ FileList._maskTimeout = window.setTimeout(function(){
+ // reset opacity
+ $mask.removeClass('transparent');
+ }, 250);
+ },
+ hideMask: function(){
+ var $mask = $('#content .mask').remove();
+ if (FileList._maskTimeout){
+ window.clearTimeout(FileList._maskTimeout);
+ }
}
};
@@ -629,8 +764,8 @@ $(document).ready(function(){
}
// update folder size
- var size = parseInt(data.context.data('size'));
- size += parseInt(file.size) ;
+ var size = parseInt(data.context.data('size'));
+ size += parseInt(file.size);
data.context.attr('data-size', size);
data.context.find('td.filesize').text(humanFileSize(size));
@@ -710,5 +845,55 @@ $(document).ready(function(){
$(window).trigger('beforeunload');
});
+ function parseHashQuery(){
+ var hash = window.location.hash,
+ pos = hash.indexOf('?'),
+ query;
+ if (pos >= 0){
+ return hash.substr(pos + 1);
+ }
+ return '';
+ }
+
+ function parseCurrentDirFromUrl(){
+ var query = parseHashQuery(),
+ params,
+ dir = '/';
+ // try and parse from URL hash first
+ if (query){
+ params = OC.parseQueryString(query);
+ }
+ // else read from query attributes
+ if (!params){
+ params = OC.parseQueryString(location.search);
+ }
+ return (params && params.dir) || '/';
+ }
+
+ // fallback to hashchange when no history support
+ if (!window.history.pushState){
+ $(window).on('hashchange', function(){
+ FileList.changeDirectory(parseCurrentDirFromUrl(), false);
+ });
+ }
+ window.onpopstate = function(e){
+ var targetDir;
+ if (e.state && e.state.dir){
+ targetDir = e.state.dir;
+ }
+ else{
+ // read from URL
+ targetDir = parseCurrentDirFromUrl();
+ }
+ if (targetDir){
+ FileList.changeDirectory(targetDir, false);
+ }
+ }
+
+ if (parseInt($('#ajaxLoad').val(), 10) === 1){
+ // need to initially switch the dir to the one from the hash (IE8)
+ FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
+ }
+
FileList.createFileSummary();
});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index d729077ea7229c08d16785b368d3ab492c4636e7..c2418cfa751355f8f0a028a64aa3f13300ffe789 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -94,29 +94,106 @@ Files={
OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
return;
}
+ },
+
+ setupDragAndDrop: function(){
+ var $fileList = $('#fileList');
+
+ //drag/drop of files
+ $fileList.find('tr td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
+ $(e).draggable(dragOptions);
+ }
+ });
+
+ $fileList.find('tr[data-type="dir"] td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
+ $(e).droppable(folderDropOptions);
+ }
+ });
+ },
+
+ lastWidth: 0,
+
+ initBreadCrumbs: function () {
+ Files.lastWidth = 0;
+ Files.breadcrumbs = [];
+
+ // initialize with some extra space
+ Files.breadcrumbsWidth = 64;
+ if ( document.getElementById("navigation") ) {
+ Files.breadcrumbsWidth += $('#navigation').get(0).offsetWidth;
+ }
+ Files.hiddenBreadcrumbs = 0;
+
+ $.each($('.crumb'), function(index, breadcrumb) {
+ Files.breadcrumbs[index] = breadcrumb;
+ Files.breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
+ });
+
+ $.each($('#controls .actions>div'), function(index, action) {
+ Files.breadcrumbsWidth += $(action).get(0).offsetWidth;
+ });
+
+ // event handlers for breadcrumb items
+ $('#controls .crumb a').on('click', onClickBreadcrumb);
+ },
+
+ resizeBreadcrumbs: function (width, firstRun) {
+ if (width != Files.lastWidth) {
+ if ((width < Files.lastWidth || firstRun) && width < Files.breadcrumbsWidth) {
+ if (Files.hiddenBreadcrumbs == 0) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('a').hide();
+ $(Files.breadcrumbs[1]).append('<span>...</span>');
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ Files.hiddenBreadcrumbs = 2;
+ }
+ var i = Files.hiddenBreadcrumbs;
+ while (width < Files.breadcrumbsWidth && i > 1 && i < Files.breadcrumbs.length - 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ Files.hiddenBreadcrumbs = i;
+ i++
+ }
+ } else if (width > Files.lastWidth && Files.hiddenBreadcrumbs > 0) {
+ var i = Files.hiddenBreadcrumbs;
+ while (width > Files.breadcrumbsWidth && i > 0) {
+ if (Files.hiddenBreadcrumbs == 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('span').remove();
+ $(Files.breadcrumbs[1]).find('a').show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ } else {
+ $(Files.breadcrumbs[i]).show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ if (Files.breadcrumbsWidth > width) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ break;
+ }
+ }
+ i--;
+ Files.hiddenBreadcrumbs = i;
+ }
+ }
+ Files.lastWidth = width;
+ }
}
};
$(document).ready(function() {
+ // FIXME: workaround for trashbin app
+ if (window.trashBinApp){
+ return;
+ }
Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);
- $('#fileList tr').each(function(){
- //little hack to set unescape filenames in attribute
- $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
- });
+
+ FileList.postProcessList();
+ Files.setupDragAndDrop();
$('#file_action_panel').attr('activeAction', false);
- //drag/drop of files
- $('#fileList tr td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
- $(e).draggable(dragOptions);
- }
- });
- $('#fileList tr[data-type="dir"] td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
- $(e).droppable(folderDropOptions);
- }
- });
$('div.crumb:not(.last)').droppable(crumbDropOptions);
$('ul#apps>li:first-child').data('dir','');
if($('div.crumb').length){
@@ -268,72 +345,15 @@ $(document).ready(function() {
//do a background scan if needed
scanFiles();
- var lastWidth = 0;
- var breadcrumbs = [];
- var breadcrumbsWidth = 0;
- if ( document.getElementById("navigation") ) {
- breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
- }
- var hiddenBreadcrumbs = 0;
-
- $.each($('.crumb'), function(index, breadcrumb) {
- breadcrumbs[index] = breadcrumb;
- breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
- });
-
-
- $.each($('#controls .actions>div'), function(index, action) {
- breadcrumbsWidth += $(action).get(0).offsetWidth;
- });
-
- function resizeBreadcrumbs(firstRun) {
- var width = $(this).width();
- if (width != lastWidth) {
- if ((width < lastWidth || firstRun) && width < breadcrumbsWidth) {
- if (hiddenBreadcrumbs == 0) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('a').hide();
- $(breadcrumbs[1]).append('<span>...</span>');
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- hiddenBreadcrumbs = 2;
- }
- var i = hiddenBreadcrumbs;
- while (width < breadcrumbsWidth && i > 1 && i < breadcrumbs.length - 1) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- hiddenBreadcrumbs = i;
- i++
- }
- } else if (width > lastWidth && hiddenBreadcrumbs > 0) {
- var i = hiddenBreadcrumbs;
- while (width > breadcrumbsWidth && i > 0) {
- if (hiddenBreadcrumbs == 1) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('span').remove();
- $(breadcrumbs[1]).find('a').show();
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- } else {
- $(breadcrumbs[i]).show();
- breadcrumbsWidth += $(breadcrumbs[i]).get(0).offsetWidth;
- if (breadcrumbsWidth > width) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- break;
- }
- }
- i--;
- hiddenBreadcrumbs = i;
- }
- }
- lastWidth = width;
- }
- }
+ Files.initBreadCrumbs();
$(window).resize(function() {
- resizeBreadcrumbs(false);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, false);
});
- resizeBreadcrumbs(true);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, true);
// display storage warnings
setTimeout ( "Files.displayStorageWarnings()", 100 );
@@ -415,10 +435,6 @@ function boolOperationFinished(data, callback) {
}
}
-function updateBreadcrumb(breadcrumbHtml) {
- $('p.nav').empty().html(breadcrumbHtml);
-}
-
var createDragShadow = function(event){
//select dragged file
var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
@@ -681,3 +697,9 @@ function checkTrashStatus() {
}
});
}
+
+function onClickBreadcrumb(e){
+ var $el = $(e.target).closest('.crumb');
+ e.preventDefault();
+ FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+}
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 648ffce79d65dedcbb8fbcfe7ef1cdf4ccb0cb35..eb724d19548ba58523c9e4c60af56228cd4b14f7 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"undo" => "desfés",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
+"{dirs} and {files}" => "{dirs} i {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
"files uploading" => "fitxers pujant",
"'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 7a5785577afea4db115733e9e88b5903f3b36f9c..ce92ff8f187e8db16556fa76ed7c2296ad908662 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -33,15 +33,17 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"undo" => "deshacer",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n carpetas"),
+"_%n file_::_%n files_" => array("","%n archivos"),
+"{dirs} and {files}" => "{dirs} y {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"files uploading" => "subiendo archivos",
"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.",
"Name" => "Nombre",
"Size" => "Tamaño",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 1c26c10028d517b997ccd122381e67740992eac4..d9d103626308028b22cd44b0b997de7aa3eaf6a5 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -33,9 +33,10 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
"undo" => "deshacer",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
+"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
+"{dirs} and {files}" => "{carpetas} y {archivos}",
+"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"files uploading" => "Subiendo archivos",
"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
"File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 5a2bb437d39187cfb35c80870eaeb8da73ad4152..52ba1191706066d39740326e5a7e51f95943ec6c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"undo" => "tagasi",
"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
"_%n file_::_%n files_" => array("%n fail","%n faili"),
+"{dirs} and {files}" => "{dirs} ja {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
"files uploading" => "faili üleslaadimisel",
"'.' is an invalid file name." => "'.' on vigane failinimi.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index ce19bb60eb701ea71a98406333429da94690736e..2d538262a0a259f64a3343f1f601d4e8fb8ed5ef 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -6,8 +6,8 @@ $TRANSLATIONS = array(
"Invalid Token" => "Jeton non valide",
"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
"No file was uploaded" => "Pas de fichier envoyé.",
"Missing a temporary folder" => "Absence de dossier temporaire.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 6ec1816308a41dd84d6cd1e43e8dc57d1fed76f3..01a6b54f8421ff31a42df10e8bb1922d74afc2d9 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"undo" => "desfacer",
"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
+"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
"files uploading" => "ficheiros enviándose",
"'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 9ec565da441e76146bf78f6b7dc0346b25b397bb..d98848a71f099a262830da1784c277ddde68b566 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"URL cannot be empty." => "ناونیشانی بهستهر نابێت بهتاڵ بێت.",
"Error" => "ههڵه",
+"Share" => "هاوبەشی کردن",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 0530adc2ae24ab98133f8317af18eecc16bd55d9..83ed8e8688f2f916f38df58e875262df4fa141b0 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
"Could not move %s" => "Nepavyko perkelti %s",
+"Unable to set upload directory." => "Nepavyksta nustatyti įkėlimų katalogo.",
+"Invalid Token" => "Netinkamas ženklas",
"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
@@ -31,19 +33,22 @@ $TRANSLATIONS = array(
"cancel" => "atšaukti",
"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
"undo" => "anuliuoti",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
+"_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
+"{dirs} and {files}" => "{dirs} ir {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"),
"files uploading" => "įkeliami failai",
"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
"File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
"Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
"Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
"Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
"Name" => "Pavadinimas",
"Size" => "Dydis",
"Modified" => "Pakeista",
+"%s could not be renamed" => "%s negali būti pervadintas",
"Upload" => "Įkelti",
"File handling" => "Failų tvarkymas",
"Maximum upload size" => "Maksimalus įkeliamo failo dydis",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 9fb1351736959ba43fd87e35d28877022b2c5603..8e9454e7945fed03a9fa0168149d0f911d982b19 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"undo" => "ongedaan maken",
"_%n folder_::_%n folders_" => array("","%n mappen"),
"_%n file_::_%n files_" => array("","%n bestanden"),
+"{dirs} and {files}" => "{dirs} en {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
"files uploading" => "bestanden aan het uploaden",
"'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index b1f38057a88572c9e76ab4e28b896918a3d5349c..58aafac27c4d8c2497b6b8349d6a84ab293893da 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
"Could not move %s" => "Klarte ikkje flytta %s",
+"Unable to set upload directory." => "Klarte ikkje å endra opplastingsmappa.",
+"Invalid Token" => "Ugyldig token",
"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
@@ -31,19 +33,22 @@ $TRANSLATIONS = array(
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
"undo" => "angre",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"{dirs} and {files}" => "{dirs} og {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"),
"files uploading" => "filer lastar opp",
"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",
+"%s could not be renamed" => "Klarte ikkje å omdøypa på %s",
"Upload" => "Last opp",
"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 4b22b080b28e9b4524060fa929ca69d9c0aa44ee..d8edf7173a8af5f09b3809cb6f9989d9dd0ec2c1 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -33,15 +33,17 @@ $TRANSLATIONS = array(
"cancel" => "anuluj",
"replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
"undo" => "cofnij",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"),
+"_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"),
+"{dirs} and {files}" => "{katalogi} and {pliki}",
+"_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"),
"files uploading" => "pliki wczytane",
"'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
"File name cannot be empty." => "Nazwa pliku nie może być pusta.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
"Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
"Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
"Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.",
"Name" => "Nazwa",
"Size" => "Rozmiar",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index de9644bd58813cb9182a506b4ab681ff77447640..f9915f251b47b7a1dbb4bf2b36ecd84f591409da 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -33,10 +33,10 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
"undo" => "desfazer",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
"{dirs} and {files}" => "{dirs} e {files}",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"),
"files uploading" => "enviando arquivos",
"'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
"File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 59f6cc68499f9460f24da3980c9ddf5c80fd1f29..0a96eaa2479da9d80ec7af3755edee6d7f8b9a18 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -6,27 +6,27 @@ $TRANSLATIONS = array(
"Invalid Token" => "Jeton Invalid",
"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste marimea maxima permisa in php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
"No file was uploaded" => "Nu a fost încărcat nici un fișier",
-"Missing a temporary folder" => "Lipsește un director temporar",
-"Failed to write to disk" => "Eroare la scriere pe disc",
+"Missing a temporary folder" => "Lipsește un dosar temporar",
+"Failed to write to disk" => "Eroare la scrierea discului",
"Not enough storage available" => "Nu este suficient spațiu disponibil",
"Upload failed" => "Încărcarea a eșuat",
-"Invalid directory." => "Director invalid.",
+"Invalid directory." => "registru invalid.",
"Files" => "Fișiere",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "lista nu se poate incarca poate fi un fisier sau are 0 bytes",
"Not enough space available" => "Nu este suficient spațiu disponibil",
"Upload cancelled." => "Încărcare anulată.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-"URL cannot be empty." => "Adresa URL nu poate fi goală.",
+"URL cannot be empty." => "Adresa URL nu poate fi golita",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
"Error" => "Eroare",
-"Share" => "Partajează",
+"Share" => "a imparti",
"Delete permanently" => "Stergere permanenta",
"Rename" => "Redenumire",
-"Pending" => "În așteptare",
+"Pending" => "in timpul",
"{new_name} already exists" => "{new_name} deja exista",
"replace" => "înlocuire",
"suggest name" => "sugerează nume",
@@ -39,10 +39,11 @@ $TRANSLATIONS = array(
"files uploading" => "fișiere se încarcă",
"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
-"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
+"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate",
+"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin {spatiu folosit}%",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
+"Your download is being prepared. This might take some time if the files are big." => "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
"Name" => "Nume",
"Size" => "Dimensiune",
"Modified" => "Modificat",
@@ -51,25 +52,25 @@ $TRANSLATIONS = array(
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
-"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor",
-"Enable ZIP-download" => "Activează descărcare fișiere compresate",
+"Needed for multi-file and folder downloads." => "necesar la descarcarea mai multor liste si fisiere",
+"Enable ZIP-download" => "permite descarcarea codurilor ZIP",
"0 is unlimited" => "0 e nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
"Save" => "Salvează",
"New" => "Nou",
-"Text file" => "Fișier text",
+"Text file" => "lista",
"Folder" => "Dosar",
"From link" => "de la adresa",
"Deleted files" => "Sterge fisierele",
"Cancel upload" => "Anulează încărcarea",
-"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.",
+"You don’t have write permissions here." => "Nu ai permisiunea de a scrie aici.",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
-"Unshare" => "Anulare partajare",
+"Unshare" => "Anulare",
"Delete" => "Șterge",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
+"Files are being scanned, please wait." => "Fișierele sunt scanate, asteptati va rog",
"Current scanning" => "În curs de scanare",
"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
);
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index ff09e7b4f9514b5ee27d066b311f5042c609549d..3207e3a165c9f6684edcf58fdf1f6835b12c6d48 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
"Could not move %s" => "%s nuk u spostua",
+"Unable to set upload directory." => "Nuk është i mundur caktimi i dosjes së ngarkimit.",
+"Invalid Token" => "Përmbajtje e pavlefshme",
"No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
"There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:",
@@ -11,6 +13,7 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Një dosje e përkohshme nuk u gjet",
"Failed to write to disk" => "Ruajtja në disk dështoi",
"Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme",
+"Upload failed" => "Ngarkimi dështoi",
"Invalid directory." => "Dosje e pavlefshme.",
"Files" => "Skedarët",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte",
@@ -18,6 +21,7 @@ $TRANSLATIONS = array(
"Upload cancelled." => "Ngarkimi u anulua.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.",
"URL cannot be empty." => "URL-i nuk mund të jetë bosh.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i",
"Error" => "Veprim i gabuar",
"Share" => "Nda",
"Delete permanently" => "Elimino përfundimisht",
@@ -29,19 +33,22 @@ $TRANSLATIONS = array(
"cancel" => "anulo",
"replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
"undo" => "anulo",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
+"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
+"{dirs} and {files}" => "{dirs} dhe {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"),
"files uploading" => "po ngarkoj skedarët",
"'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
"File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
"Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.",
"Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
"Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.",
"Name" => "Emri",
"Size" => "Dimensioni",
"Modified" => "Modifikuar",
+"%s could not be renamed" => "Nuk është i mundur riemërtimi i %s",
"Upload" => "Ngarko",
"File handling" => "Trajtimi i skedarit",
"Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 781590cff35316ed183c42b9beb94dbf69a1ed29..bea1d930799d4ee0e47045efdcf5b1b18106eb12 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
"Could not move %s" => "Не вдалося перемістити %s",
+"Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 7135ef9f656525fbc18b3fd7c87b95873ce481a2..f0d3560b878397506bfc6048a798c29ca207d3a9 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -17,4 +17,120 @@ class Helper
'maxHumanFilesize' => $maxHumanFilesize,
'usedSpacePercent' => (int)$storageInfo['relative']);
}
+
+ public static function determineIcon($file) {
+ if($file['type'] === 'dir') {
+ $dir = $file['directory'];
+ $absPath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir.'/'.$file['name']);
+ $mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
+ if (!is_null($mount)) {
+ $sid = $mount->getStorageId();
+ if (!is_null($sid)) {
+ $sid = explode(':', $sid);
+ if ($sid[0] === 'shared') {
+ return \OC_Helper::mimetypeIcon('dir-shared');
+ }
+ if ($sid[0] !== 'local') {
+ return \OC_Helper::mimetypeIcon('dir-external');
+ }
+ }
+ }
+ return \OC_Helper::mimetypeIcon('dir');
+ }
+
+ if($file['isPreviewAvailable']) {
+ $relativePath = substr($file['path'], 6);
+ return \OC_Helper::previewIcon($relativePath);
+ }
+ return \OC_Helper::mimetypeIcon($file['mimetype']);
+ }
+
+ /**
+ * Comparator function to sort files alphabetically and have
+ * the directories appear first
+ * @param array $a file
+ * @param array $b file
+ * @return -1 if $a must come before $b, 1 otherwise
+ */
+ public static function fileCmp($a, $b) {
+ if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
+ return -1;
+ } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
+ return 1;
+ } else {
+ return strnatcasecmp($a['name'], $b['name']);
+ }
+ }
+
+ /**
+ * Retrieves the contents of the given directory and
+ * returns it as a sorted array.
+ * @param string $dir path to the directory
+ * @return array of files
+ */
+ public static function getFiles($dir) {
+ $content = \OC\Files\Filesystem::getDirectoryContent($dir);
+ $files = array();
+
+ foreach ($content as $i) {
+ $i['date'] = \OCP\Util::formatDate($i['mtime']);
+ if ($i['type'] === 'file') {
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ if (!empty($fileinfo['extension'])) {
+ $i['extension'] = '.' . $fileinfo['extension'];
+ } else {
+ $i['extension'] = '';
+ }
+ }
+ $i['directory'] = $dir;
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
+ $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $files[] = $i;
+ }
+
+ usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+
+ return $files;
+ }
+
+ /**
+ * Splits the given path into a breadcrumb structure.
+ * @param string $dir path to process
+ * @return array where each entry is a hash of the absolute
+ * directory path and its name
+ */
+ public static function makeBreadcrumb($dir){
+ $breadcrumb = array();
+ $pathtohere = '';
+ foreach (explode('/', $dir) as $i) {
+ if ($i !== '') {
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+ }
+ }
+ return $breadcrumb;
+ }
+
+ /**
+ * Returns the numeric permissions for the given directory.
+ * @param string $dir directory without trailing slash
+ * @return numeric permissions
+ */
+ public static function getDirPermissions($dir){
+ $permissions = \OCP\PERMISSION_READ;
+ if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_CREATE;
+ }
+ if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_UPDATE;
+ }
+ if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_DELETE;
+ }
+ if (\OC\Files\Filesystem::isSharable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_SHARE;
+ }
+ return $permissions;
+ }
}
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 29cb457cd5a5ea9547d92d3e0cd9178982081934..bd991c3fcb04f0f27df4d50079b82bde457b9716 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,8 +1,7 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
<div id="controls">
<?php print_unescaped($_['breadcrumb']); ?>
- <?php if ($_['isCreatable']):?>
- <div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
+ <div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?> <?php if (isset($_['files']) and count($_['files'])==0):?>emptycontent<?php endif; ?>">
<div id="new" class="button">
<a><?php p($l->t('New'));?></a>
<ul>
@@ -16,29 +15,23 @@
</div>
<div id="upload" class="button"
title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
- <form data-upload-id='1'
- id="data-upload-form"
- class="file_upload_form"
- action="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>"
- method="post"
- enctype="multipart/form-data"
- target="file_upload_target_1">
<?php if($_['uploadMaxFilesize'] >= 0):?>
<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
value="<?php p($_['uploadMaxFilesize']) ?>">
<?php endif;?>
<!-- Send the requesttoken, this is needed for older IE versions
because they don't send the CSRF token via HTTP header in this case -->
- <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
<input type="hidden" class="max_human_file_size"
value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
- <input type="file" id="file_upload_start" name='files[]'/>
+ <input type="file" id="file_upload_start" name='files[]'
+ data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
<a href="#" class="svg"></a>
- </form>
</div>
<?php if ($_['trash'] ): ?>
- <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
+ <div id="trash" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>>
+ <a><?php p($l->t('Deleted files'));?></a>
+ </div>
<?php endif; ?>
<div id="uploadprogresswrapper">
<div id="uploadprogressbar"></div>
@@ -48,16 +41,15 @@
</div>
</div>
<div id="file_action_panel"></div>
- <?php elseif( !$_['isPublic'] ):?>
- <div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
- <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
- <?php endif;?>
+ <div class="notCreatable notPublic <?php if ($_['isCreatable'] or $_['isPublic'] ):?>hidden<?php endif; ?>">
+ <div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
+ </div>
<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
</div>
-<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
- <div id="emptycontent"><?php p($l->t('Nothing in here. Upload something!'))?></div>
-<?php endif; ?>
+<div id="emptycontent" <?php if (!isset($_['files']) or !$_['isCreatable'] or count($_['files']) > 0 or !$_['ajaxLoad']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
+
+<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
<thead>
@@ -82,7 +74,7 @@
<th id="headerDate">
<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
-<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
+<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
<?php if ($_['dir'] == '/Shared'): ?>
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Unshare'))?>
@@ -120,6 +112,7 @@
</div>
<!-- config hints for javascript -->
+<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 4076c1bb3313ed892905ba1088453b0ea0f21425..1e4d4d11c98dbfa6344abe6ec9a1f48e993d7588 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,7 +1,7 @@
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
+<?php $totalfiles = 0;
+$totaldirs = 0;
+$totalsize = 0; ?>
<?php foreach($_['files'] as $file):
- //strlen('files/') => 6
- $relativePath = substr($file['path'], 6);
// the bigger the file, the darker the shade of grey; megabytes*2
$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
if($simple_size_color<0) $simple_size_color = 0;
@@ -22,26 +22,7 @@
<?php else: ?>
<td class="filename svg"
<?php endif; ?>
- <?php if($file['type'] == 'dir'): ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
- <?php else: ?>
- <?php if($_['isPublic']): ?>
- <?php
- $relativePath = substr($relativePath, strlen($_['sharingroot']));
- ?>
- <?php if($file['isPreviewAvailable']): ?>
- style="background-image:url(<?php print_unescaped(OCP\publicPreview_icon($relativePath, $_['sharingtoken'])); ?>)"
- <?php else: ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
- <?php endif; ?>
- <?php else: ?>
- <?php if($file['isPreviewAvailable']): ?>
- style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
- <?php else: ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
+ style="background-image:url(<?php print_unescaped($file['icon']); ?>)"
>
<?php if(!isset($_['readonly']) || !$_['readonly']): ?>
<input id="select-<?php p($file['fileid']); ?>" type="checkbox" />
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 8341bafc9fdab992bdc942f13d6cf41f1b29e8bb..2d644708c59ed3ece59af8046b5fab59205c280b 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
"Missing requirements." => "Requisitos incompletos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index cac8c465362b83b47dc5b0b1064ede90814c3aa8..666ea59687c404bb19e088ce0e2a43a7288dd3de 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos.",
"Missing requirements." => "Requisitos incompletos.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 53b0a6b25cd9e8cbb785ee47cd69ee0488fa49de..b3df41b1f423440e467b8942011d2fd0f85d836c 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,11 +1,21 @@
<?php
$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
"Saving..." => "Tallennetaan...",
+"personal settings" => "henkilökohtaiset asetukset",
"Encryption" => "Salaus",
+"Recovery key password" => "Palautusavaimen salasana",
"Enabled" => "Käytössä",
"Disabled" => "Ei käytössä",
-"Change Password" => "Vaihda salasana"
+"Change recovery key password:" => "Vaihda palautusavaimen salasana:",
+"Old Recovery key password" => "Vanha palautusavaimen salasana",
+"New Recovery key password" => "Uusi palautusavaimen salasana",
+"Change Password" => "Vaihda salasana",
+"Old log-in password" => "Vanha kirjautumis-salasana",
+"Current log-in password" => "Nykyinen kirjautumis-salasana",
+"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 9fbf7b296046029bc85f376afdd9b90df55cfdc3..4ededb716f4e16badeef5a02d1ff36ba341bcc79 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -6,12 +6,34 @@ $TRANSLATIONS = array(
"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+"Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
+"Missing requirements." => "Trūkstami laukai.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
+"Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:",
"Saving..." => "Saugoma...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?",
+"You can unlock your private key in your " => "Galite atrakinti savo privatų raktą savo",
+"personal settings" => "asmeniniai nustatymai",
"Encryption" => "Šifravimas",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+"Recovery key password" => "Atkūrimo rakto slaptažodis",
"Enabled" => "Įjungta",
"Disabled" => "Išjungta",
+"Change recovery key password:" => "Pakeisti atkūrimo rakto slaptažodį:",
+"Old Recovery key password" => "Senas atkūrimo rakto slaptažodis",
+"New Recovery key password" => "Naujas atkūrimo rakto slaptažodis",
"Change Password" => "Pakeisti slaptažodį",
-"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
+"Your private key password no longer match your log-in password:" => "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:",
+"Set your old private key password to your current log-in password." => "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+"Old log-in password" => "Senas prisijungimo slaptažodis",
+"Current log-in password" => "Dabartinis prisijungimo slaptažodis",
+"Update Private Key Password" => "Atnaujinti privataus rakto slaptažodį",
+"Enable password recovery:" => "Įjungti slaptažodžio atkūrimą:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.",
+"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti",
"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index b99d0751540d4008389f1b53ebb8b775d0a24f1f..bb30d69c592a803fe5846cfd5ab0d9099ef95ca3 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Saving..." => "Lagrar …"
+"Saving..." => "Lagrar …",
+"Encryption" => "Kryptering"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 680beddfe680f72a72753efa561323cf9c0f19ff..e4fb053a71aea2c49dd40493340d1fd82d4751ec 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Saving..." => "Зберігаю...",
-"Encryption" => "Шифрування"
+"Encryption" => "Шифрування",
+"Change Password" => "Змінити Пароль"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 5386de486e190d93aa5671e577d53aa2ba651033..9be3dda7ce3f766a8d62054194bbaa419593952f 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -220,22 +220,10 @@ class Keymanager {
*/
public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath) {
- // try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
-
- $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
-
- if ($result) {
-
- return $result;
-
- }
-
- }
-
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filename = self::fixPartialFilePath($filename);
$filePath_f = ltrim($filename, '/');
// in case of system wide mount points the keys are stored directly in the data directory
@@ -424,18 +412,6 @@ class Keymanager {
public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
// try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
-
- $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
-
- if ($result) {
-
- return $result;
-
- }
-
- }
-
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -443,7 +419,7 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
-
+ $filename = self::fixPartialFilePath($filename);
// in case of system wide mount points the keys are stored directly in the data directory
if ($util->isSystemWideMountPoint($filename)) {
$shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 335ea3733eb2f90565bfe2e2098dbe82876732e3..083b33c03cbf2be40e674a8e509c3d5743975fb7 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -81,7 +81,7 @@ class Stream {
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path) {
-
+
// assume that the file already exist before we decide it finally in getKey()
$this->newFile = false;
@@ -106,12 +106,12 @@ class Stream {
if ($this->relPath === false) {
$this->relPath = Helper::getPathToRealFile($this->rawPath);
}
-
+
if($this->relPath === false) {
\OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '" expecting a path to user/files or to user/files_versions', \OCP\Util::ERROR);
return false;
}
-
+
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -188,7 +188,7 @@ class Stream {
}
// Get the data from the file handle
- $data = fread($this->handle, 8192);
+ $data = fread($this->handle, $count);
$result = null;
@@ -272,7 +272,7 @@ class Stream {
} else {
$this->newFile = true;
-
+
return false;
}
@@ -296,9 +296,9 @@ class Stream {
return strlen($data);
}
- // Disable the file proxies so that encryption is not
- // automatically attempted when the file is written to disk -
- // we are handling that separately here and we don't want to
+ // Disable the file proxies so that encryption is not
+ // automatically attempted when the file is written to disk -
+ // we are handling that separately here and we don't want to
// get into an infinite loop
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -311,7 +311,7 @@ class Stream {
$pointer = ftell($this->handle);
// Get / generate the keyfile for the file we're handling
- // If we're writing a new file (not overwriting an existing
+ // If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
if (!$this->getKey()) {
@@ -319,7 +319,7 @@ class Stream {
}
- // If extra data is left over from the last round, make sure it
+ // If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ($this->writeCache) {
@@ -344,12 +344,12 @@ class Stream {
if ($remainingLength < 6126) {
// Set writeCache to contents of $data
- // The writeCache will be carried over to the
- // next write round, and added to the start of
- // $data to ensure that written blocks are
- // always the correct length. If there is still
- // data in writeCache after the writing round
- // has finished, then the data will be written
+ // The writeCache will be carried over to the
+ // next write round, and added to the start of
+ // $data to ensure that written blocks are
+ // always the correct length. If there is still
+ // data in writeCache after the writing round
+ // has finished, then the data will be written
// to disk by $this->flush().
$this->writeCache = $data;
@@ -363,7 +363,7 @@ class Stream {
$encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
- // Write the data chunk to disk. This will be
+ // Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
fwrite($this->handle, $encrypted);
@@ -488,6 +488,7 @@ class Stream {
$this->meta['mode'] !== 'rb' &&
$this->size > 0
) {
+
// only write keyfiles if it was a new file
if ($this->newFile === true) {
@@ -535,6 +536,7 @@ class Stream {
// set fileinfo
$this->rootView->putFileInfo($this->rawPath, $fileInfo);
+
}
return fclose($this->handle);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b8d6862349395efa1a02b7039b267cee87faa700..d40c5d1a97774c7b8fb8946f058087edc181e0de 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -329,72 +329,73 @@ class Util {
$this->view->is_dir($directory)
&& $handle = $this->view->opendir($directory)
) {
-
- while (false !== ($file = readdir($handle))) {
-
- if (
- $file !== "."
- && $file !== ".."
- ) {
-
- $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
- $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
-
- // If the path is a directory, search
- // its contents
- if ($this->view->is_dir($filePath)) {
-
- $this->findEncFiles($filePath, $found);
-
- // If the path is a file, determine
- // its encryption status
- } elseif ($this->view->is_file($filePath)) {
-
- // Disable proxies again, some-
- // where they got re-enabled :/
- \OC_FileProxy::$enabled = false;
-
- $isEncryptedPath = $this->isEncryptedPath($filePath);
- // If the file is encrypted
- // NOTE: If the userId is
- // empty or not set, file will
- // detected as plain
- // NOTE: This is inefficient;
- // scanning every file like this
- // will eat server resources :(
- if (
- Keymanager::getFileKey($this->view, $this->userId, $relPath)
- && $isEncryptedPath
- ) {
-
- $found['encrypted'][] = array(
- 'name' => $file,
- 'path' => $filePath
- );
-
- // If the file uses old
- // encryption system
- } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
-
- $found['legacy'][] = array(
- 'name' => $file,
- 'path' => $filePath
- );
-
- // If the file is not encrypted
- } else {
-
- $found['plain'][] = array(
- 'name' => $file,
- 'path' => $relPath
- );
+ if(is_resource($handle)) {
+ while (false !== ($file = readdir($handle))) {
+
+ if (
+ $file !== "."
+ && $file !== ".."
+ ) {
+
+ $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+ $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
+
+ // If the path is a directory, search
+ // its contents
+ if ($this->view->is_dir($filePath)) {
+
+ $this->findEncFiles($filePath, $found);
+
+ // If the path is a file, determine
+ // its encryption status
+ } elseif ($this->view->is_file($filePath)) {
+
+ // Disable proxies again, some-
+ // where they got re-enabled :/
+ \OC_FileProxy::$enabled = false;
+
+ $isEncryptedPath = $this->isEncryptedPath($filePath);
+ // If the file is encrypted
+ // NOTE: If the userId is
+ // empty or not set, file will
+ // detected as plain
+ // NOTE: This is inefficient;
+ // scanning every file like this
+ // will eat server resources :(
+ if (
+ Keymanager::getFileKey($this->view, $this->userId, $relPath)
+ && $isEncryptedPath
+ ) {
+
+ $found['encrypted'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file uses old
+ // encryption system
+ } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
+
+ $found['legacy'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file is not encrypted
+ } else {
+
+ $found['plain'][] = array(
+ 'name' => $file,
+ 'path' => $relPath
+ );
+
+ }
}
}
}
-
}
\OC_FileProxy::$enabled = true;
@@ -508,10 +509,11 @@ class Util {
// get the size from filesystem
$fullPath = $this->view->getLocalFile($path);
- $size = filesize($fullPath);
+ $size = $this->view->filesize($path);
// calculate last chunk nr
$lastChunkNr = floor($size / 8192);
+ $lastChunkSize = $size - ($lastChunkNr * 8192);
// open stream
$stream = fopen('crypt://' . $path, "r");
@@ -524,7 +526,7 @@ class Util {
fseek($stream, $lastChunckPos);
// get the content of the last chunk
- $lastChunkContent = fread($stream, 8192);
+ $lastChunkContent = fread($stream, $lastChunkSize);
// calc the real file size with the size of the last chunk
$realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
@@ -1136,6 +1138,11 @@ class Util {
// Make sure that a share key is generated for the owner too
list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+ $pathinfo = pathinfo($ownerPath);
+ if(array_key_exists('extension', $pathinfo) && $pathinfo['extension'] === 'part') {
+ $ownerPath = $pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ }
+
$userIds = array();
if ($sharingEnabled) {
@@ -1289,8 +1296,25 @@ class Util {
*/
public function getUidAndFilename($path) {
+ $pathinfo = pathinfo($path);
+ $partfile = false;
+ $parentFolder = false;
+ if (array_key_exists('extension', $pathinfo) && $pathinfo['extension'] === 'part') {
+ // if the real file exists we check this file
+ $filePath = $this->userFilesDir . '/' .$pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ if ($this->view->file_exists($filePath)) {
+ $pathToCheck = $pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ } else { // otherwise we look for the parent
+ $pathToCheck = $pathinfo['dirname'];
+ $parentFolder = true;
+ }
+ $partfile = true;
+ } else {
+ $pathToCheck = $path;
+ }
+
$view = new \OC\Files\View($this->userFilesDir);
- $fileOwnerUid = $view->getOwner($path);
+ $fileOwnerUid = $view->getOwner($pathToCheck);
// handle public access
if ($this->isPublic) {
@@ -1319,12 +1343,18 @@ class Util {
$filename = $path;
} else {
-
- $info = $view->getFileInfo($path);
+ $info = $view->getFileInfo($pathToCheck);
$ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
// Fetch real file path from DB
- $filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
+ $filename = $ownerView->getPath($info['fileid']);
+ if ($parentFolder) {
+ $filename = $filename . '/'. $pathinfo['filename'];
+ }
+
+ if ($partfile) {
+ $filename = $filename . '.' . $pathinfo['extension'];
+ }
}
@@ -1333,10 +1363,9 @@ class Util {
\OC_Filesystem::normalizePath($filename)
);
}
-
-
}
+
/**
* @brief go recursively through a dir and collect all files and sub files.
* @param string $dir relative to the users files folder
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
index e7fa44b34d17e4062a29c35a8b0629bea27c5de4..7e0fafdad83c452b92d459fe476c05f04e7f6517 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
@@ -1,4 +1,3 @@
<?php
require_once("autoload.inc.php");
require_once("ProdsConfig.inc.php");
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
index 478c90d631f20c5281eaf342630ef86168f15308..1089932a3e208200e1cd3f017cd1c651ff87e1ac 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
@@ -15,5 +15,3 @@ if (file_exists(__DIR__ . "/prods.ini")) {
else {
$GLOBALS['PRODS_CONFIG'] = array();
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
index be7c6c567882b0e45b71391e3305120331e6ff92..fdf100b77a4ba85fa7c1ad2b18605ba6ee27d2f5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
@@ -279,5 +279,3 @@ abstract class ProdsPath
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
index 62469725970100076c712fd0556cb60c23a192b0..5e8dc92d594d8b3ce43767a05dea46c4435f9766 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
@@ -103,5 +103,3 @@ class ProdsQuery
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
index 42308d9cc35190095f9b637eff2b17f46921a5ee..d14d87ad1aa9aed61948facbf21ae0235c907641 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
@@ -58,5 +58,3 @@ class ProdsRule
return $result;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
index 27b927bb0331ff4b32306a645b6da74ef366c2de..67ef096c5c5be494099d1d5c368eba49fa918762 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
@@ -432,5 +432,3 @@ stream_wrapper_register('rods', 'ProdsStreamer')
or die ('Failed to register protocol:rods');
stream_wrapper_register('rods+ticket', 'ProdsStreamer')
or die ('Failed to register protocol:rods');
-?>
-
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
index f47f85bc238393fbddf2f4dd1cb5b3975c914eb7..ba4c5ad96b053da6bf38001d8398e5f91caaee56 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
@@ -199,5 +199,3 @@ class RODSAccount
return $dir->toURI();
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
index 0498f42cfaa7a43821222ee3b0513d58b043d328..c10f880a5cc435da896b161edc6e531751680788 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
@@ -1611,5 +1611,3 @@ class RODSConn
return $results;
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
index 830e01bde8447f97d10a806e589209f939411321..b3e8155da4d60a0927d1fca87da02e8168815826 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
@@ -77,5 +77,3 @@ class RODSConnManager
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
index 52eb95bbfb5c3c8f55fa51103b2438f86c9cbd54..97116a102c1ce5e2ae37235b6ce4d4c09de921be 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
@@ -180,5 +180,3 @@ class RODSException extends Exception
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
index 848f29e85e95c83ad4fc77781f56124f8a066921..4bc10cc549fc4b35e14ef0c385c17ad626e0193c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
@@ -110,5 +110,3 @@ class RODSGenQueConds
return $this->cond;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
index 41be1069afd8dc3ecea38280b67565b0e05ff72f..899b4f0e3b40a8d987572e90b378c629d3169a9f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
@@ -95,5 +95,3 @@ class RODSGenQueResults
return $this->numrow;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
index 10a32f6614faecbc424127f592ddad10f9b0ca95..aa391613d07c1e4018b86051b3f85cdf63ae741d 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
@@ -156,5 +156,3 @@ class RODSGenQueSelFlds
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
index 31b720cf19cb419f5bcdd810f0292db7c32ca33c..f347f7c988af2fc7235184fe8548ef05f97a0102 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
@@ -46,5 +46,3 @@ class RODSKeyValPair
return $new_keyval;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
index ca3e8bc23a6055ab34e42c5e5d35a781591088c9..243903a42dfe7d3ca02f97e52cd4cf1a8d180cfb 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
@@ -181,5 +181,3 @@ class RODSMessage
return $rods_msg->pack();
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
index 95807d12ea8d3ba89f4b440ef2265be4d3bfcbef..1d367e900bc955ded06eee80e2219c5f9e5bb151 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
@@ -17,4 +17,3 @@ define ("RSYNC_OPR", 14);
define ("PHYMV_OPR", 15);
define ("PHYMV_SRC", 16);
define ("PHYMV_DEST", 17);
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
index c4e2c031174ecb1589089138cfb6339ca96236d1..258dfcab39d3a3cdc04c8d3197e47055584a3084 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
@@ -214,4 +214,3 @@ $GLOBALS['PRODS_API_NUMS_REV'] = array(
'1100' => 'SSL_START_AN',
'1101' => 'SSL_END_AN',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
index 1d51f619197a287eacb0de25bc491ffa57254aad..ecc2f5c2593ddf3f2fbd89163e8bb5d296903284 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
@@ -4,5 +4,3 @@
// are doing!
define ("ORDER_BY", 0x400);
define ("ORDER_BY_DESC", 0x800);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
index 7c4bb170d4a631a985f6e5f580055fa863799e26..177ca5b12600fb26b51442f33e40529f3f046330 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
@@ -584,4 +584,3 @@ $GLOBALS['PRODS_ERR_CODES_REV'] = array(
'-993000' => 'PAM_AUTH_PASSWORD_FAILED',
'-994000' => 'PAM_AUTH_PASSWORD_INVALID_TTL',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
index ff830c6d6aabe1a8da5b35134aaa566f74fb53c6..55ad02e3b82a8e2a915990ab9836a5713ccd0cf3 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
@@ -222,4 +222,3 @@ $GLOBALS['PRODS_GENQUE_KEYWD_REV'] = array(
"lastExeTime" => 'RULE_LAST_EXE_TIME_KW',
"exeStatus" => 'RULE_EXE_STATUS_KW',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
index 82de94095b21787a653129cbc5d22b87b92d692d..a65823ec8778569b0e6b3924e44a769fd8425a54 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
@@ -232,4 +232,3 @@ $GLOBALS['PRODS_GENQUE_NUMS_REV'] = array(
'1105' => 'COL_TOKEN_VALUE3',
'1106' => 'COL_TOKEN_COMMENT',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
index 89040882d20f053bb16e827e45d23a4d84cca0b6..e5cff1f60e3adfbf38eaad58db61126b8890207a 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
@@ -246,5 +246,3 @@ class RODSPacket
}
*/
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
index 8cabcd0ae423ccc1dd1d431c99d0618d942d314a..a7598bb7e62938e27ba12f877710c00c39ed3cee 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
@@ -10,5 +10,3 @@ class RP_BinBytesBuf extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
index b7ad6fd0cad02dc2f4892da951b38146756f091b..05c51cf56c0caaf9e2b3b0ee99e96cc55c6cc1e9 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
@@ -15,5 +15,3 @@ class RP_CollInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
index 939d2e3759641a1ba07ec22e0a7bb62dcb60890c..a9140050bc7be3c8c1839a19b218878f1cdc4c7f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
@@ -13,5 +13,3 @@ class RP_CollOprStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
index c16b3628f5ebd901905de52e9dbc8816462b391f..481ff34a22ab172f55bcfcb49fc6522bb3159c5c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
@@ -15,5 +15,3 @@ class RP_DataObjCopyInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
index f7a8f939b82d6bfdf5158f7138380e06ae58f777..f6200d1761c6948aa91832e0bc41548d17246a5f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
@@ -18,5 +18,3 @@ class RP_DataObjInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
index 55dcb02383d12179e423dc53d5733e573ca5d2fd..a7559e3c2566045233826f56e00e657f7c1b44e9 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
@@ -52,5 +52,3 @@ class RP_ExecCmdOut extends RODSPacket
}
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
index 88a62fc2b0c6515de6614f285df0f482f1db2384..2eb5dbd6ff95c461a29f3f12a007030b7818599b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
@@ -18,5 +18,3 @@ class RP_ExecMyRuleInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
index 2e1e29a2bfeb440c6572c0f7138c5294c518b9b8..cf4bf3406067408a6ef6738589ea6e17e781b76c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
@@ -21,5 +21,3 @@ class RP_GenQueryInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
index e9f31dd5368be60e68382a17add633fb3d1ca11f..afec88c45b16ab4440782601a2f292508164cb73 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
@@ -18,5 +18,3 @@ class RP_GenQueryOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
index ac56bc93df8cf67a8cd77638c49efd32a732df33..e8af5c9fc5c8f2e4350e390621e1f5087730acfd 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
@@ -23,5 +23,3 @@ class RP_InxIvalPair extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
index 787d27fd1031f5b6e0dab90573c35324b2205fa6..4a08780f4a3415afca1b3909194f6be10ea86b26 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
@@ -40,5 +40,3 @@ class RP_InxValPair extends RODSPacket
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
index 6d8dd12ff1263577a6796e68bcb9371f9b506ea6..905d88bc8a2191000c4b7adebe782c49c19ab1ac 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
@@ -43,5 +43,3 @@ class RP_KeyValPair extends RODSPacket
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
index 65ee3580e97043dcb0790448327a14b734e79ab6..4f54c9c4e76ded758adbc8ce73284dd81234eb27 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
@@ -13,5 +13,3 @@ class RP_MiscSvrInfo extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
index b67b7083d44667f65f751e33228fed76099abdb9..467541734dfd2ff1deaf41421223f3df2d80895e 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
@@ -14,5 +14,3 @@ class RP_ModAVUMetadataInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
index abf9bc471bbf0ecee958e4e5dce2d246f916ca7b..fa5d4fcc3dc690d36cf405f7ebd58445b1cb00c0 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
@@ -41,5 +41,3 @@ class RP_MsParam extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
index b747c098dd21d79fd955ce67690c28f18f8311bb..b664abe62bc69da99855c2fbd1b946f8e4ed2a86 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
@@ -17,5 +17,3 @@ class RP_MsParamArray extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
index 0249da9a05d2f1406620a5d9a4e33ad639c5e3e2..f1b03f779d13b0703f8a60e73011ece66747d161 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
@@ -12,6 +12,3 @@ class RP_MsgHeader extends RODSPacket
}
}
-
-?>
-
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
index 28602f3150f4d3e62fe282e5fa4a7d26bbbc8018..2ac70dc22cceb6ec611f31047791d7decf2bc31b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
@@ -11,5 +11,3 @@ class RP_RHostAddr extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
index 290a4c9a5b0ff5cf0f9409e7362efd615d697e3a..96f427a2de5a2dc2d59be26cfc4eb256ee0fe4bc 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
@@ -16,5 +16,3 @@ class RP_RodsObjStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
index 3f5a91a35d053e023295a8e89882e4ee7bd550e8..af7739988d4f22164452bd2b7bae6fff9cf510b5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
@@ -10,5 +10,3 @@ class RP_STR extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
index 1950f096f1307a7f553ec2f8abd8b75912985336..e6ee1c3adbb6eb0fc81f3ad506e96dac41e6aab1 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
@@ -11,5 +11,3 @@ class RP_SqlResult extends RODSPacket
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
index a411bd7425b01bf759ed0b9474314a08d2db08a7..700fbd34428c03f26c9066a4d065907c121ee16d 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
@@ -14,5 +14,3 @@ class RP_StartupPack extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
index bb591f01343a0eb2031ddf14a867c2dfa0f72b37..5c962649df0f627efc1949b15fa9be7f709e70bd 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
@@ -12,5 +12,3 @@ class RP_TransStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
index a08cb6cc24c6340206aee7149cf394ae0e81a6bf..9fa9b7d1c3517b7b5d75f99e7c21867a0b2321d0 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
@@ -12,5 +12,3 @@ class RP_Version extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
index 9dc87140635980e9f515f8b5fce6569a3d305feb..a702650c0eb4259a7d6a221c63e1483db7c05274 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
@@ -10,5 +10,3 @@ class RP_authRequestOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
index 23d754df0acff8989bacd99fabf0115191d14393..3f9cbc618f7e5087ffdfa2a9fa7a1df97923a2bc 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
@@ -10,5 +10,3 @@ class RP_authResponseInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
index d16e1b3f3a44b4472b76b2d530a8c71c94fdc3c7..d37afe23c9539065240b09b0fb9c466eb1d4e9ad 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjCloseInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
index 29bd1b68e35577025c0b14cb3ee754b3a1a06175..31b12354714e90907ae2f61a424584c635f7afb8 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjReadInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
index 5327d7a8932a9daec965efcf4e4f5cb63f51b311..175b7e834029c6d9260fe14e946d80f8479eb528 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjWriteInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
index e28a7b3b49870fd96c45375d5343a73218200855..83b77f4704fce5d802c57e0ab7e8ad8abc987436 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
@@ -12,5 +12,3 @@ class RP_fileLseekInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
index cf01741bea605e0de73404a94dafe21850320127..45811e7ca68e8c2ef1e39ddfd25682ef5ed419b2 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
@@ -11,5 +11,3 @@ class RP_fileLseekOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
index ba073e979398e85e6359dff6d39b72a34348bc29..29c1001df68c27dbd47ec7117602f63a8be1cc69 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
@@ -10,5 +10,3 @@ class RP_getTempPasswordOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
index 0bbc2334a827738875ed43033d0247bd01714bce..e42ac918d459d44b1b529cc33cb019c2c8696125 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
@@ -10,4 +10,3 @@ class RP_pamAuthRequestInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
index 01959954c97f6c5c0e186f25614a37289b9b52cf..b3ec13065569a48d9cfaacf29a08952257fb70ee 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
@@ -10,4 +10,3 @@ class RP_pamAuthRequestOut extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
index 530f304860442b04aaf180ca23275d24d496232f..26470378a7df6052921bcde2e5e7c279c2594ad7 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
@@ -10,4 +10,3 @@ class RP_sslEndInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
index 03c8365898e698671b4237f10eb147b434447eb5..a23756e78601cdee8eba1b51aaede158b5443f1b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
@@ -10,4 +10,3 @@ class RP_sslStartInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
index 382a85c051e0866bfb53bcf42a51d4ea97bb62e1..98c1f6cabdfcb18f41a10684dad686d9b11dca7a 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
@@ -66,5 +66,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_api_num_file, $outputstr);
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
index d5c4377384525434aa7e0e42db41bbfe0f1bb841..142b4af57020e47f50661ef4890523ed880a4f2f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
@@ -71,5 +71,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_error_table_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
index 4372a849aac0703523a714795572d995dad19d08..5a5968d25af99bd62a510b71876c575badd46dfa 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
@@ -69,5 +69,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_genque_keywd_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
index 03fa051f092a4ef70c18484b8e0092eec151e0ca..0be297826e642dfa234e0c654e20fd57696963f5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
@@ -59,5 +59,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_genque_num_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 2d7bcd4ac376b5d69f15f0899824e7d38fe6fee3..c08a266b48c23d36e897cae68b319af36d4963df 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -183,17 +183,20 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' || $file === '..') {
- continue;
- }
- if ($this->is_dir($path . '/' . $file)) {
- $this->rmdir($path . '/' . $file);
- } else {
- $this->unlink($path . '/' . $file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
+
+ if ($this->is_dir($path . '/' . $file)) {
+ $this->rmdir($path . '/' . $file);
+ } else {
+ $this->unlink($path . '/' . $file);
+ }
}
- }
+ }
try {
$result = $this->connection->deleteObject(array(
@@ -464,15 +467,17 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path1);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' || $file === '..') {
- continue;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
+
+ $source = $path1 . '/' . $file;
+ $target = $path2 . '/' . $file;
+ $this->copy($source, $target);
}
-
- $source = $path1 . '/' . $file;
- $target = $path2 . '/' . $file;
- $this->copy($source, $target);
- }
+ }
}
return true;
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1935740cd2e4a5748c4e1763cf73093885d26c58..659959e662e439fcbd5ca80878fd482b277b4c5f 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -378,7 +378,7 @@ class OC_Mount_Config {
}
$result = array();
$handle = opendir($path);
- if ( ! $handle) {
+ if(!is_resource($handle)) {
return array();
}
while (false !== ($file = readdir($handle))) {
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 215bdcda6c2356a645f631eeef2ab10fed746e16..b63b5885de1ac80287c334e3e821b8c8523e7390 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -206,14 +206,16 @@ class Google extends \OC\Files\Storage\Common {
public function rmdir($path) {
if (trim($path, '/') === '') {
$dir = $this->opendir($path);
- while (($file = readdir($dh)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
- if (!$this->unlink($path.'/'.$file)) {
- return false;
+ if(is_resource($dir)) {
+ while (($file = readdir($dir)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ if (!$this->unlink($path.'/'.$file)) {
+ return false;
+ }
}
}
+ closedir($dir);
}
- closedir($dir);
$this->driveFiles = array();
return true;
} else {
diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php
index 7ec3b3a0cfc09f32cfcb02aa289a5f73b7386386..6d4f66e856e1a72f0300fca229c7bbf9658cdf60 100644
--- a/apps/files_external/lib/irods.php
+++ b/apps/files_external/lib/irods.php
@@ -27,12 +27,12 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
private $auth_mode;
public function __construct($params) {
- if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+ if (isset($params['host'])) {
$this->host = $params['host'];
- $this->port = $params['port'];
- $this->user = $params['user'];
- $this->password = $params['password'];
- $this->use_logon_credentials = $params['use_logon_credentials'];
+ $this->port = isset($params['port']) ? $params['port'] : 1247;
+ $this->user = isset($params['user']) ? $params['user'] : '';
+ $this->password = isset($params['password']) ? $params['password'] : '';
+ $this->use_logon_credentials = ($params['use_logon_credentials'] === 'true');
$this->zone = $params['zone'];
$this->auth_mode = isset($params['auth_mode']) ? $params['auth_mode'] : '';
@@ -42,10 +42,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
}
// take user and password from the session
- if ($this->use_logon_credentials && isset($_SESSION['irods-credentials']) )
+ if ($this->use_logon_credentials && \OC::$session->exists('irods-credentials'))
{
- $this->user = $_SESSION['irods-credentials']['uid'];
- $this->password = $_SESSION['irods-credentials']['password'];
+ $params = \OC::$session->get('irods-credentials');
+ $this->user = $params['uid'];
+ $this->password = $params['password'];
}
//create the root folder if necessary
@@ -55,11 +56,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
} else {
throw new \Exception();
}
-
+
}
public static function login( $params ) {
- $_SESSION['irods-credentials'] = $params;
+ \OC::$session->set('irods-credentials', $params);
}
public function getId(){
@@ -137,11 +138,13 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
private function collectionMTime($path) {
$dh = $this->opendir($path);
$lastCTime = $this->filemtime($path);
- while (($file = readdir($dh)) !== false) {
- if ($file != '.' and $file != '..') {
- $time = $this->filemtime($file);
- if ($time > $lastCTime) {
- $lastCTime = $time;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' and $file != '..') {
+ $time = $this->filemtime($file);
+ if ($time > $lastCTime) {
+ $lastCTime = $time;
+ }
}
}
}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 8e7a28fba1ad0a46cc3702c2916363d8ff6c3767..ecd4dae04849a19dccd316bb0f11d0e1f9411b78 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -99,11 +99,13 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
private function shareMTime() {
$dh=$this->opendir('');
$lastCtime=0;
- while (($file = readdir($dh)) !== false) {
- if ($file!='.' and $file!='..') {
- $ctime=$this->filemtime($file);
- if ($ctime>$lastCtime) {
- $lastCtime=$ctime;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file!='.' and $file!='..') {
+ $ctime=$this->filemtime($file);
+ if ($ctime>$lastCtime) {
+ $lastCtime=$ctime;
+ }
}
}
}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 357c6fdf5404548de49e44a8b1ed3ca45deef361..acabc9a5c10f8e48550bc0649e0ce30462237767 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -7,8 +7,6 @@ function fileDownloadPath(dir, file) {
return url;
}
-var form_data;
-
$(document).ready(function() {
$('#data-upload-form').tipsy({gravity:'ne', fade:true});
@@ -50,19 +48,20 @@ $(document).ready(function() {
});
}
- // Add some form data to the upload handler
- file_upload_param.formData = {
- MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
- requesttoken: $('#publicUploadRequestToken').val(),
- dirToken: $('#dirToken').val(),
- appname: 'files_sharing',
- subdir: $('input#dir').val()
- };
+ var file_upload_start = $('#file_upload_start');
+ file_upload_start.on('fileuploadadd', function(e, data) {
+ // Add custom data to the upload handler
+ data.formData = {
+ requesttoken: $('#publicUploadRequestToken').val(),
+ dirToken: $('#dirToken').val(),
+ subdir: $('input#dir').val()
+ };
+ });
- // Add Uploadprogress Wrapper to controls bar
- $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
+ // Add Uploadprogress Wrapper to controls bar
+ $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
- // Cancel upload trigger
- $('#cancel_upload_button').click(Files.cancelUploads);
+ // Cancel upload trigger
+ $('#cancel_upload_button').click(Files.cancelUploads);
});
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3be89a39fa0c135fac4d3aeeafeb2efc9382dd0f..03ed02f41ef0cf2557ad13013d24beba03d27e9d 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
- $('#fileList').one('fileActionsReady',function(){
+ $('#fileList').on('fileActionsReady',function(){
OC.Share.loadIcons('file');
});
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 1f238d083fbdb07945ba2980ee1266b34f71c460..e163da766f34bd0edcb518bea57cacc48e386ba2 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -3,7 +3,7 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
-"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.",
+"Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.",
"Reasons might be:" => "Las causas podrían ser:",
"the item was removed" => "el elemento fue eliminado",
"the link expired" => "el enlace expiró",
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index fed0b1e7b30f9b4ed4520296b79b3ca1f23b14bb..7c9dcb94ac19b4f258195d0a8148b595cae5a1a3 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -3,6 +3,12 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
+"Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
+"Reasons might be:" => "Las causas podrían ser:",
+"the item was removed" => "el elemento fue borrado",
+"the link expired" => "el enlace expiró",
+"sharing is disabled" => "compartir está desactivado",
+"For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
"%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
"%s shared the file %s with you" => "%s compartió el archivo %s con vos",
"Download" => "Descargar",
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 5d0e58e2fb295dc0023bd474c08b839542cb5aca..90ae6a39a074378f25e6ae33d84cc8079bd58d21 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
"Password" => "Slaptažodis",
"Submit" => "Išsaugoti",
+"Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.",
+"Reasons might be:" => "Galimos priežastys:",
+"the item was removed" => "elementas buvo pašalintas",
+"the link expired" => "baigėsi nuorodos galiojimo laikas",
+"sharing is disabled" => "dalinimasis yra išjungtas",
+"For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
"%s shared the file %s with you" => "%s pasidalino su jumis %s failu",
"Download" => "Atsisiųsti",
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index bcb6538b09f22b1a6b880ff63f8eec2b56239185..94272943e40b9606c30a56bd7226363d307379cc 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
"Password" => "Passord",
"Submit" => "Send",
+"Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
+"Reasons might be:" => "Moglege grunnar:",
+"the item was removed" => "fila/mappa er fjerna",
+"the link expired" => "lenkja har gått ut på dato",
+"sharing is disabled" => "deling er slått av",
+"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
"%s shared the folder %s with you" => "%s delte mappa %s med deg",
"%s shared the file %s with you" => "%s delte fila %s med deg",
"Download" => "Last ned",
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index ae29e5738ffdd8f67c3ad72b96a497e55cf09907..d2077663e8d7bef61be1aa4a445f6623226492d1 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Kodi është i gabuar. Provojeni përsëri.",
"Password" => "Kodi",
"Submit" => "Parashtro",
+"Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
+"Reasons might be:" => "Arsyet mund të jenë:",
+"the item was removed" => "elementi është eliminuar",
+"the link expired" => "lidhja ka skaduar",
+"sharing is disabled" => "ndarja është çaktivizuar",
+"For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
"%s shared the file %s with you" => "%s ndau me ju skedarin %s",
"Download" => "Shkarko",
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index d91acbbb2bdb708d2de8bf58705c667fe536a23e..257da89c84e52e3a68ae27d4282109301b461563 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -221,7 +221,8 @@ class Shared extends \OC\Files\Storage\Common {
public function filemtime($path) {
if ($path == '' || $path == '/') {
$mtime = 0;
- if ($dh = $this->opendir($path)) {
+ $dh = $this->opendir($path);
+ if(is_resource($dh)) {
while (($filename = readdir($dh)) !== false) {
$tempmtime = $this->filemtime($filename);
if ($tempmtime > $mtime) {
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index ec6b4e815f80ba5fc9c42728bfa0cf81d5eaf02e..8d474e87b48e979e7f9de3d96b2695b254ef1f10 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -19,6 +19,20 @@ function fileCmp($a, $b) {
}
}
+function determineIcon($file, $sharingRoot, $sharingToken) {
+ // for folders we simply reuse the files logic
+ if($file['type'] == 'dir') {
+ return \OCA\files\lib\Helper::determineIcon($file);
+ }
+
+ $relativePath = substr($file['path'], 6);
+ $relativePath = substr($relativePath, strlen($sharingRoot));
+ if($file['isPreviewAvailable']) {
+ return OCP\publicPreview_icon($relativePath, $sharingToken);
+ }
+ return OCP\mimetype_icon($file['mimetype']);
+}
+
if (isset($_GET['t'])) {
$token = $_GET['t'];
$linkItem = OCP\Share::getShareByToken($token);
@@ -133,6 +147,7 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']);
+ $tmpl->assign('disableSharing', true);
$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false;
@@ -172,10 +187,11 @@ if (isset($path)) {
} else {
$i['extension'] = '';
}
- $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
}
$i['directory'] = $getPath;
$i['permissions'] = OCP\PERMISSION_READ;
+ $i['icon'] = determineIcon($i, $basePath, $token);
$files[] = $i;
}
usort($files, "fileCmp");
@@ -191,7 +207,6 @@ if (isset($path)) {
}
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files);
- $list->assign('disableSharing', true);
$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
$list->assign('downloadURL',
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..e72e67b01d7e504f6a5fa5f54278e6fde67a28b5
--- /dev/null
+++ b/apps/files_trashbin/ajax/list.php
@@ -0,0 +1,51 @@
+<?php
+
+// only need filesystem apps
+$RUNTIME_APPTYPES=array('filesystem');
+
+// Init owncloud
+
+
+OCP\JSON::checkLoggedIn();
+
+// Load the files
+$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
+$data = array();
+
+// Make breadcrumb
+if($doBreadcrumb) {
+ $breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+
+ $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
+ $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+ $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
+ $breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
+
+ $data['breadcrumb'] = $breadcrumbNav->fetchPage();
+}
+
+// make filelist
+$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+
+if ($files === null){
+ header("HTTP/1.0 404 Not Found");
+ exit();
+}
+
+$dirlisting = false;
+if ($dir && $dir !== '/') {
+ $dirlisting = true;
+}
+
+$encodedDir = \OCP\Util::encodePath($dir);
+$list = new OCP\Template('files_trashbin', 'part.list', '');
+$list->assign('files', $files, false);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
+$list->assign('dirlisting', $dirlisting);
+$list->assign('disableDownloadActions', true);
+$data['files'] = $list->fetchPage();
+
+OCP\JSON::success(array('data' => $data));
+
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 0baeab1de9734ad9e821ecfb6333e6573f534793..9f17448a757ecce21f03e57f3ea9fff70674de09 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -10,91 +10,52 @@ OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
OCP\Util::addScript('files', 'fileactions');
$tmpl = new OCP\Template('files_trashbin', 'index', 'user');
-$user = \OCP\User::getUser();
-$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files');
-
OCP\Util::addStyle('files', 'files');
OCP\Util::addScript('files', 'filelist');
+// filelist overrides
+OCP\Util::addScript('files_trashbin', 'filelist');
+OCP\Util::addscript('files', 'files');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
-$result = array();
-if ($dir) {
- $dirlisting = true;
- $dirContent = $view->opendir($dir);
- $i = 0;
- while(($entryName = readdir($dirContent)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
- $pos = strpos($dir.'/', '/', 1);
- $tmp = substr($dir, 0, $pos);
- $pos = strrpos($tmp, '.d');
- $timestamp = substr($tmp, $pos+2);
- $result[] = array(
- 'id' => $entryName,
- 'timestamp' => $timestamp,
- 'mime' => $view->getMimeType($dir.'/'.$entryName),
- 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
- 'location' => $dir,
- );
- }
- }
- closedir($dirContent);
-
-} else {
- $dirlisting = false;
- $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
- $result = $query->execute(array($user))->fetchAll();
+$isIE8 = false;
+preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+if (count($matches) > 0 && $matches[1] <= 8){
+ $isIE8 = true;
}
-$files = array();
-foreach ($result as $r) {
- $i = array();
- $i['name'] = $r['id'];
- $i['date'] = OCP\Util::formatDate($r['timestamp']);
- $i['timestamp'] = $r['timestamp'];
- $i['mimetype'] = $r['mime'];
- $i['type'] = $r['type'];
- if ($i['type'] === 'file') {
- $fileinfo = pathinfo($r['id']);
- $i['basename'] = $fileinfo['filename'];
- $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
+if ($isIE8 && isset($_GET['dir'])){
+ if ($dir === ''){
+ $dir = '/';
}
- $i['directory'] = $r['location'];
- if ($i['directory'] === '/') {
- $i['directory'] = '';
- }
- $i['permissions'] = OCP\PERMISSION_READ;
- $i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
- $files[] = $i;
+ header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+ exit();
}
-function fileCmp($a, $b) {
- if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
- return -1;
- } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
- return 1;
- } else {
- return strnatcasecmp($a['name'], $b['name']);
- }
+$ajaxLoad = false;
+
+if (!$isIE8){
+ $files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+}
+else{
+ $files = array();
+ $ajaxLoad = true;
}
-usort($files, "fileCmp");
-
-// Make breadcrumb
-$pathtohere = '';
-$breadcrumb = array();
-foreach (explode('/', $dir) as $i) {
- if ($i !== '') {
- if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
- $name = $match[1];
- } else {
- $name = $i;
- }
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
- }
+// Redirect if directory does not exist
+if ($files === null){
+ header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php'));
+ exit();
}
+$dirlisting = false;
+if ($dir && $dir !== '/') {
+ $dirlisting = true;
+}
+
+$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
@@ -106,7 +67,6 @@ $list->assign('files', $files);
$encodedDir = \OCP\Util::encodePath($dir);
$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
-$list->assign('disableSharing', true);
$list->assign('dirlisting', $dirlisting);
$list->assign('disableDownloadActions', true);
@@ -114,6 +74,8 @@ $tmpl->assign('dirlisting', $dirlisting);
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
$tmpl->assign('fileList', $list->fetchPage());
$tmpl->assign('files', $files);
-$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($view->getAbsolutePath()));
+$tmpl->assign('dir', $dir);
+$tmpl->assign('disableSharing', true);
+$tmpl->assign('ajaxLoad', true);
$tmpl->printPage();
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd5a67ddfe002d502d013074b1baf496a948cbbf
--- /dev/null
+++ b/apps/files_trashbin/js/filelist.js
@@ -0,0 +1,24 @@
+// override reload with own ajax call
+FileList.reload = function(){
+ FileList.showMask();
+ if (FileList._reloadCall){
+ FileList._reloadCall.abort();
+ }
+ $.ajax({
+ url: OC.filePath('files_trashbin','ajax','list.php'),
+ data: {
+ dir : $('#dir').val(),
+ breadcrumb: true
+ },
+ error: function(result) {
+ FileList.reloadCallback(result);
+ },
+ success: function(result) {
+ FileList.reloadCallback(result);
+ }
+ });
+}
+
+FileList.linkTo = function(dir){
+ return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+}
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 40c0bdb382945b3d611a20e16c04516f60d02c3e..d73eadb6011d40ac73797b617e4e26bb493e5c45 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -171,9 +171,15 @@ $(document).ready(function() {
action(filename);
}
}
+
+ // event handlers for breadcrumb items
+ $('#controls').delegate('.crumb:not(.home) a', 'click', onClickBreadcrumb);
});
- FileActions.actions.dir = {};
+ FileActions.actions.dir = {
+ // only keep 'Open' action for navigation
+ 'Open': FileActions.actions.dir.Open
+ };
});
function processSelection(){
@@ -246,3 +252,9 @@ function disableActions() {
$(".action").css("display", "none");
$(":input:checkbox").css("display", "none");
}
+function onClickBreadcrumb(e){
+ var $el = $(e.target).closest('.crumb');
+ e.preventDefault();
+ FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+}
+
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index 956d89ae6880d44befddef8290d8ea46c3947562..a5639c2c71454d6d1e5aa4210b4b94acec21b7c6 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
+"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
"Restore" => "Recuperar",
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index 6f47255b50652bf06c450dc91f35bfc8df1d7385..0cb969a3483b4f1ce7c83aabfe6f6867510bacdd 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Borrar de manera permanente",
"Name" => "Nombre",
"Deleted" => "Borrado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n directorio","%n directorios"),
+"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
+"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
"Restore" => "Recuperar",
"Delete" => "Borrar",
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index c4a12ff21755aff9c89634d80665430c68699333..0a51290f4d99bf12f2ffea6417eb951179df7efc 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Ištrinti negrįžtamai",
"Name" => "Pavadinimas",
"Deleted" => "Ištrinti",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n aplankų"),
+"_%n file_::_%n files_" => array("","","%n failų"),
+"restored" => "atstatyta",
"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
"Restore" => "Atstatyti",
"Delete" => "Ištrinti",
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 9e351668e33626bd279e9638c59a2939bc8a27bf..73fe48211c293719e167c1c4c0f7722cfd0cc735 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
"Deleted" => "Sletta",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"restored" => "gjenoppretta",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index e8295e2ff038bd599cc2962ef918d8a3fac93018..c838a6b956c2e583964dcc186fc9d7ebaac6509b 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Trwale usuń",
"Name" => "Nazwa",
"Deleted" => "Usunięte",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n katalogów"),
+"_%n file_::_%n files_" => array("","","%n plików"),
"restored" => "przywrócony",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 1e3c67ba027a48389c527fa45287e80e0b9675eb..e0e8c8faec6b7f87f0e62a6e3557474514fac548 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Excluir permanentemente",
"Name" => "Nome",
"Deleted" => "Excluído",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n pastas"),
+"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
"Restore" => "Restaurar",
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index 1b7b5b828c81e08db327277b77d964d062fd0cfa..50ca7d901b598f10dd6502c22e4e24f955d01f97 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Elimino përfundimisht",
"Name" => "Emri",
"Deleted" => "Eliminuar",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
+"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
+"restored" => "rivendosur",
"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
"Restore" => "Rivendos",
"Delete" => "Elimino",
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..4cb5e8a39022929b40fff2e474e254bd8a1d3ee8
--- /dev/null
+++ b/apps/files_trashbin/lib/helper.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OCA\files_trashbin\lib;
+
+class Helper
+{
+ /**
+ * Retrieves the contents of a trash bin directory.
+ * @param string $dir path to the directory inside the trashbin
+ * or empty to retrieve the root of the trashbin
+ * @return array of files
+ */
+ public static function getTrashFiles($dir){
+ $result = array();
+ $user = \OCP\User::getUser();
+
+ if ($dir && $dir !== '/') {
+ $view = new \OC_Filesystemview('/'.$user.'/files_trashbin/files');
+ $dirContent = $view->opendir($dir);
+ if ($dirContent === false){
+ return null;
+ }
+ if(is_resource($dirContent)){
+ while(($entryName = readdir($dirContent)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
+ $pos = strpos($dir.'/', '/', 1);
+ $tmp = substr($dir, 0, $pos);
+ $pos = strrpos($tmp, '.d');
+ $timestamp = substr($tmp, $pos+2);
+ $result[] = array(
+ 'id' => $entryName,
+ 'timestamp' => $timestamp,
+ 'mime' => $view->getMimeType($dir.'/'.$entryName),
+ 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
+ 'location' => $dir,
+ );
+ }
+ }
+ closedir($dirContent);
+ }
+ } else {
+ $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
+ $result = $query->execute(array($user))->fetchAll();
+ }
+
+ $files = array();
+ foreach ($result as $r) {
+ $i = array();
+ $i['name'] = $r['id'];
+ $i['date'] = \OCP\Util::formatDate($r['timestamp']);
+ $i['timestamp'] = $r['timestamp'];
+ $i['mimetype'] = $r['mime'];
+ $i['type'] = $r['type'];
+ if ($i['type'] === 'file') {
+ $fileinfo = pathinfo($r['id']);
+ $i['basename'] = $fileinfo['filename'];
+ $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+ }
+ $i['directory'] = $r['location'];
+ if ($i['directory'] === '/') {
+ $i['directory'] = '';
+ }
+ $i['permissions'] = \OCP\PERMISSION_READ;
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
+ $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $files[] = $i;
+ }
+
+ usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+
+ return $files;
+ }
+
+ /**
+ * Splits the given path into a breadcrumb structure.
+ * @param string $dir path to process
+ * @return array where each entry is a hash of the absolute
+ * directory path and its name
+ */
+ public static function makeBreadcrumb($dir){
+ // Make breadcrumb
+ $pathtohere = '';
+ $breadcrumb = array();
+ foreach (explode('/', $dir) as $i) {
+ if ($i !== '') {
+ if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
+ $name = $match[1];
+ } else {
+ $name = $i;
+ }
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
+ }
+ }
+ return $breadcrumb;
+ }
+}
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 88c32b1f3ebeee2f7eb397dd42cfa1625c71b47d..82ba0608834c95e6fcdc2632dd694235c90613b7 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,10 +5,14 @@
</div>
<div id='notification'></div>
-<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?>
+<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false && !$_['ajaxLoad']):?>
<div id="emptycontent"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
<?php endif; ?>
+<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
+<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
+<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
+
<table id="filestable">
<thead>
<tr>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 8ecab58e5c809c462580d8e31f28fe3ad393b994..4acc298adbe3c2cdb65e59eb56148f5335e06608 100644
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -1,11 +1,11 @@
-<div class="crumb">
+<div class="crumb home">
<a href="<?php print_unescaped($_['home']); ?>">
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
</a>
</div>
<?php if(count($_["breadcrumb"])):?>
<div class="crumb svg"
- data-dir='<?php print_unescaped($_['baseURL']); ?>'>
+ data-dir='/'>
<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
</div>
<?php endif;?>
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index f7cc6b01bbb5eb9eb381e8ce81d5b2128651e64c..78709d986ae32a3e90425d6467e0673a34ecb53d 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -1,4 +1,3 @@
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
<?php foreach($_['files'] as $file):
$relative_deleted_date = OCP\relative_modified_date($file['timestamp']);
// the older the file, the brighter the shade of grey; days*14
@@ -12,7 +11,7 @@
data-permissions='<?php p($file['permissions']); ?>'
<?php if ( $_['dirlisting'] ): ?>
id="<?php p($file['directory'].'/'.$file['name']);?>"
- data-file="<?php p($file['directory'].'/'.$file['name']);?>"
+ data-file="<?php p($name);?>"
data-timestamp=''
data-dirlisting=1
<?php else: ?>
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index a6031698e06ba7b0944e638551ddf6f4d12033e8..b7acc3769786c5579c97ca8b81a93170a2b04d78 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -3,7 +3,7 @@ $TRANSLATIONS = array(
"Could not revert: %s" => "No se puede revertir: %s",
"Versions" => "Revisiones",
"Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisión {timestamp}.",
-"More versions..." => "Más...",
+"More versions..." => "Más versiones...",
"No other versions available" => "No hay otras versiones disponibles",
"Restore" => "Recuperar"
);
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index 068f835d0afe84dd2ae43a304ec118eeac5bc18f..3008220122f5365f37c3ae45298de7977c14a8c0 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "No se pudo revertir: %s ",
"Versions" => "Versiones",
+"Failed to revert {file} to revision {timestamp}." => "Falló al revertir {file} a la revisión {timestamp}.",
+"More versions..." => "Más versiones...",
+"No other versions available" => "No hay más versiones disponibles",
"Restore" => "Recuperar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 4e1af5fcc29ce58b7c82cb7e2cbba0fc42542b74..3afcfbe3b5f63aa263dce40a7dc9bf0e8a6b8dec 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "Nepavyko atstatyti: %s",
"Versions" => "Versijos",
+"Failed to revert {file} to revision {timestamp}." => "Nepavyko atstatyti {file} į būseną {timestamp}.",
+"More versions..." => "Daugiau versijų...",
+"No other versions available" => "Nėra daugiau versijų",
"Restore" => "Atstatyti"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
index 79b518bc18d0ec398ad66195c63640318bccbe32..608d72aaaed6bc5151addb0f0b214c117a98592a 100644
--- a/apps/files_versions/l10n/nn_NO.php
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
"Versions" => "Utgåver",
+"Failed to revert {file} to revision {timestamp}." => "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
+"More versions..." => "Fleire utgåver …",
+"No other versions available" => "Ingen andre utgåver tilgjengeleg",
"Restore" => "Gjenopprett"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index e59942736359a3ea784f40e795f9c27b3bebe688..4f37d5177a79a5015fb08e09dd7ffca9090bfb73 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar eliminación",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Agregar configuracion del servidor",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"",
"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"",
"Connection Settings" => "Configuración de conexión",
"Configuration Active" => "Configuracion activa",
"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
"Disable Main Server" => "Deshabilitar servidor principal",
+"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.",
"Use TLS" => "Usar TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
"Cache Time-To-Live" => "Cache TTL",
"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
"Directory Settings" => "Configuracion de directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
"Base User Tree" => "Árbol base de usuario",
"One User Base DN per line" => "Un DN Base de Usuario por línea",
"User Search Attributes" => "Atributos de la busqueda de usuario",
"Optional; one attribute per line" => "Opcional; un atributo por linea",
"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
"Base Group Tree" => "Árbol base de grupo",
"One Group Base DN per line" => "Un DN Base de Grupo por línea",
"Group Search Attributes" => "Atributos de busqueda de grupo",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
"Internal Username" => "Nombre de usuario interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
"UUID Attribute:" => "Atributo UUID:",
"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Configuración de prueba",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index ecfcae32f46e387bc0d9db48aa9a9fca2169f5d4..2436df8de7747baf96c523b2f96e34975a7385c3 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "Falló es test de conexión",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar borrado",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Añadir Configuración del Servidor",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\"",
"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"",
"Connection Settings" => "Configuración de Conección",
"Configuration Active" => "Configuración activa",
"When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.",
"Backup (Replica) Port" => "Puerto para copia de seguridad (réplica)",
"Disable Main Server" => "Deshabilitar el Servidor Principal",
+"Only connect to the replica server." => "Conectarse únicamente al servidor de réplica.",
"Use TLS" => "Usar TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarán",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
"Cache Time-To-Live" => "Tiempo de vida del caché",
"in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
"Directory Settings" => "Configuración de Directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user's display name." => "El atributo LDAP a usar para generar el nombre de usuario mostrado.",
"Base User Tree" => "Árbol base de usuario",
"One User Base DN per line" => "Una DN base de usuario por línea",
"User Search Attributes" => "Atributos de la búsqueda de usuario",
"Optional; one attribute per line" => "Opcional; un atributo por linea",
"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups's display name." => "El atributo LDAP a usar para generar el nombre de grupo mostrado.",
"Base Group Tree" => "Árbol base de grupo",
"One Group Base DN per line" => "Una DN base de grupo por línea",
"Group Search Attributes" => "Atributos de búsqueda de grupo",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
"Internal Username" => "Nombre interno de usuario",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).",
"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
"UUID Attribute:" => "Atributo UUID:",
"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Probar configuración",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 0c7d3ad078f83e328589bab8a57951bb9f8b486e..8b6027b81e6dda2c16df98ffb705ec60510ea692 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "Test de connexion échoué",
"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
"Confirm Deletion" => "Confirmer la suppression",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
"Server configuration" => "Configuration du serveur",
"Add Server Configuration" => "Ajouter une configuration du serveur",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Mot de passe",
"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
"User List Filter" => "Filtre d'utilisateurs",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"",
"Group Filter" => "Filtre de groupes",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"",
"Connection Settings" => "Paramètres de connexion",
"Configuration Active" => "Configuration active",
"When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
"Backup (Replica) Port" => "Port du serveur de backup (réplique)",
"Disable Main Server" => "Désactiver le serveur principal",
+"Only connect to the replica server." => "Se connecter uniquement au serveur de replica.",
"Use TLS" => "Utiliser TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).",
"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
"Cache Time-To-Live" => "Durée de vie du cache",
"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
"Directory Settings" => "Paramètres du répertoire",
"User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
+"The LDAP attribute to use to generate the user's display name." => "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
"Base User Tree" => "DN racine de l'arbre utilisateurs",
"One User Base DN per line" => "Un DN racine utilisateur par ligne",
"User Search Attributes" => "Recherche des attributs utilisateur",
"Optional; one attribute per line" => "Optionnel, un attribut par ligne",
"Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
+"The LDAP attribute to use to generate the groups's display name." => "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
"Base Group Tree" => "DN racine de l'arbre groupes",
"One Group Base DN per line" => "Un DN racine groupe par ligne",
"Group Search Attributes" => "Recherche des attributs du groupe",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
"Internal Username" => "Nom d'utilisateur interne",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
"Internal Username Attribute:" => "Nom d'utilisateur interne:",
"Override UUID detection" => "Surcharger la détection d'UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
"UUID Attribute:" => "Attribut UUID :",
"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
"Test Configuration" => "Tester la configuration",
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 7e8b389af7f318e49a6f6b436935a1af8bf48121..2c3b938fcfeed5a45343a65fffad100359a94387 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Deletion failed" => "Ištrinti nepavyko",
"Error" => "Klaida",
+"Host" => "Mazgas",
"Password" => "Slaptažodis",
"Group Filter" => "Grupės filtras",
"Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 5e584aa31e35e07ffb8bcf5f755867d0476d7864..470114d9359ea55f56a6d2e3c4a2a637c2dd0a45 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Deletion failed" => "Feil ved sletting",
"Error" => "Feil",
+"Host" => "Tenar",
"Password" => "Passord",
"Help" => "Hjelp"
);
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index cd8ec6659a4f519e21a8b333282215c3555e0f6b..951aabe24aed434a87e6cf46c4f298c41920ac8b 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,7 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autenticación de WevDAV",
+"WebDAV Authentication" => "Autenticación mediante WevDAV",
"Address: " => "Dirección:",
-"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 608b0ad817938738d8db88727e0427e45e81a36f..4ec0bf5a626c55dd0429a983fc89b0f611a702af 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autenticación de WevDAV"
+"WebDAV Authentication" => "Autenticación de WebDAV",
+"Address: " => "Dirección:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index 90fc2d5ac3ef78e253f0e061694a9a331e719141..41a7fa9502d52832ac244ad9d05e3d2acb3b97fc 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autorizavimas"
+"WebDAV Authentication" => "WebDAV autentikacija",
+"Address: " => "Adresas:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 519b942f9f53b750709090673b377bdbba73c61b..909231b5f5826ca6c91bd72e77bec3bc5b03d24e 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-autentisering"
+"WebDAV Authentication" => "WebDAV-autentisering",
+"Address: " => "Adresse:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index fcde044ec753d256dea8b03b62b13f09ebeca92f..dff8b308c5d5f0f2ba36c02b34d8f9977b6e63f4 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Аутентифікація WebDAV"
+"WebDAV Authentication" => "Аутентифікація WebDAV",
+"Address: " => "Адреса:"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/config/config.sample.php b/config/config.sample.php
index 0afad880c17fea42ce7fccb24eb9ec398550ce5c..29085af4716240f866ad22087180fc86cab2edda 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -212,6 +212,9 @@ $CONFIG = array(
/* cl parameters for libreoffice / openoffice */
'preview_office_cl_parameters' => '',
+/* whether avatars should be enabled */
+'enable_avatars' => true,
+
// Extra SSL options to be used for configuration
'openssl' => array(
//'config' => '/absolute/location/of/openssl.cnf',
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f7c0517c4ad4b9de1e7acb825e6870f21f34c20
--- /dev/null
+++ b/core/avatar/controller.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Avatar;
+
+class Controller {
+ public static function getAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = stripslashes($args['user']);
+ $size = (int)$args['size'];
+ if ($size > 2048) {
+ $size = 2048;
+ }
+ // Undefined size
+ elseif ($size === 0) {
+ $size = 64;
+ }
+
+ $avatar = new \OC_Avatar($user);
+ $image = $avatar->get($size);
+
+ \OC_Response::disableCaching();
+ \OC_Response::setLastModifiedHeader(time());
+ if ($image instanceof \OC_Image) {
+ \OC_Response::setETagHeader(crc32($image->data()));
+ $image->show();
+ } else {
+ // Signalizes $.avatar() to display a defaultavatar
+ \OC_JSON::success();
+ }
+ }
+
+ public static function postAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+
+ if (isset($_POST['path'])) {
+ $path = stripslashes($_POST['path']);
+ $view = new \OC\Files\View('/'.$user.'/files');
+ $newAvatar = $view->file_get_contents($path);
+ } elseif (!empty($_FILES)) {
+ $files = $_FILES['files'];
+ if (
+ $files['error'][0] === 0 &&
+ is_uploaded_file($files['tmp_name'][0]) &&
+ !\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
+ ) {
+ $newAvatar = file_get_contents($files['tmp_name'][0]);
+ unlink($files['tmp_name'][0]);
+ }
+ } else {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No image or file provided")) ));
+ return;
+ }
+
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->set($newAvatar);
+ \OC_JSON::success();
+ } catch (\OC\NotSquareException $e) {
+ $image = new \OC_Image($newAvatar);
+
+ if ($image->valid()) {
+ \OC_Cache::set('tmpavatar', $image->data(), 7200);
+ \OC_JSON::error(array("data" => "notsquare"));
+ } else {
+ $l = new \OC_L10n('core');
+
+ $mimeType = $image->mimeType();
+ if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
+ \OC_JSON::error(array("data" => array("message" => $l->t("Unknown filetype")) ));
+ }
+
+ if (!$image->valid()) {
+ \OC_JSON::error(array("data" => array("message" => $l->t("Invalid image")) ));
+ }
+ }
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+
+ public static function deleteAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->remove();
+ \OC_JSON::success();
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+
+ public static function getTmpAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $tmpavatar = \OC_Cache::get('tmpavatar');
+ if (is_null($tmpavatar)) {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
+ return;
+ }
+
+ $image = new \OC_Image($tmpavatar);
+ \OC_Response::disableCaching();
+ \OC_Response::setLastModifiedHeader(time());
+ \OC_Response::setETagHeader(crc32($image->data()));
+ $image->show();
+ }
+
+ public static function postCroppedAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+ if (isset($_POST['crop'])) {
+ $crop = $_POST['crop'];
+ } else {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No crop data provided")) ));
+ return;
+ }
+
+ $tmpavatar = \OC_Cache::get('tmpavatar');
+ if (is_null($tmpavatar)) {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
+ return;
+ }
+
+ $image = new \OC_Image($tmpavatar);
+ $image->crop($crop['x'], $crop['y'], $crop['w'], $crop['h']);
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->set($image->data());
+ // Clean up
+ \OC_Cache::remove('tmpavatar');
+ \OC_JSON::success();
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+}
diff --git a/core/css/apps.css b/core/css/apps.css
index 5de146feb1f17c211e6e1560f0d5aa0be04e3f6b..de63495e50e94bbfb93cdec4f9a4747164ea44e2 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -50,8 +50,8 @@
#app-navigation li > a {
display: block;
width: 100%;
- height: 44px;
- padding: 12px;
+ line-height: 44px;
+ padding: 0 12px;
overflow: hidden;
-moz-box-sizing: border-box; box-sizing: border-box;
white-space: nowrap;
diff --git a/core/css/styles.css b/core/css/styles.css
index bf78af15af5b3ef209581a88a12edabb9a8edaa6..dcdeda8a9c95d7aecf57db686a81bb23f23b8e4f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -40,6 +40,11 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
.header-right { float:right; vertical-align:middle; padding:0.5em; }
.header-right > * { vertical-align:middle; }
+#header .avatardiv {
+ text-shadow: none;
+ float: left;
+ display: inline-block;
+}
/* INPUTS */
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
@@ -583,8 +588,18 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
/* USER MENU */
-#settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
-#expand { padding:15px; cursor:pointer; font-weight:bold; }
+#settings {
+ float: right;
+ margin-top: 7px;
+ margin-left: 10px;
+ color: #bbb;
+ text-shadow: 0 -1px 0 #000;
+}
+#expand {
+ padding: 15px 15px 15px 5px;
+ cursor: pointer;
+ font-weight: bold;
+}
#expand:hover, #expand:focus, #expand:active { color:#fff; }
#expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; }
#expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
@@ -624,6 +639,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
.hidden { display:none; }
.bold { font-weight:bold; }
.center { text-align:center; }
+.inlineblock { display: inline-block; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
diff --git a/core/js/avatar.js b/core/js/avatar.js
new file mode 100644
index 0000000000000000000000000000000000000000..410182f01bf86d6a432968aba18612d5582dc4ed
--- /dev/null
+++ b/core/js/avatar.js
@@ -0,0 +1,9 @@
+$(document).ready(function(){
+ $('#header .avatardiv').avatar(OC.currentUser, 32);
+ // Personal settings
+ $('#avatar .avatardiv').avatar(OC.currentUser, 128);
+ // User settings
+ $.each($('td.avatar .avatardiv'), function(i, element) {
+ $(element).avatar($(element).parent().parent().data('uid'), 32);
+ });
+});
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1382fd7d2d61c7604ad65a4e710530263b92cbf
--- /dev/null
+++ b/core/js/jquery.avatar.js
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This plugin inserts the right avatar for the user, depending on, whether a
+ * custom avatar is uploaded - which it uses then - or not, and display a
+ * placeholder with the first letter of the users name instead.
+ * For this it queries the core_avatar_get route, thus this plugin is fit very
+ * tightly for owncloud, and it may not work anywhere else.
+ *
+ * You may use this on any <div></div>
+ * Here I'm using <div class="avatardiv"></div> as an example.
+ *
+ * There are 4 ways to call this:
+ *
+ * 1. $('.avatardiv').avatar('jdoe', 128);
+ * This will make the div to jdoe's fitting avatar, with a size of 128px.
+ *
+ * 2. $('.avatardiv').avatar('jdoe');
+ * This will make the div to jdoe's fitting avatar. If the div aready has a
+ * height, it will be used for the avatars size. Otherwise this plugin will
+ * search for 'size' DOM data, to use for avatar size. If neither are available
+ * it will default to 64px.
+ *
+ * 3. $('.avatardiv').avatar();
+ * This will search the DOM for 'user' data, to use as the username. If there
+ * is no username available it will default to a placeholder with the value of
+ * "x". The size will be determined the same way, as the second example.
+ *
+ * 4. $('.avatardiv').avatar('jdoe', 128, true);
+ * This will behave like the first example, except it will also append random
+ * hashes to the custom avatar images, to force image reloading in IE8.
+ */
+
+(function ($) {
+ $.fn.avatar = function(user, size, ie8fix) {
+ if (typeof(size) === 'undefined') {
+ if (this.height() > 0) {
+ size = this.height();
+ } else if (this.data('size') > 0) {
+ size = this.data('size');
+ } else {
+ size = 64;
+ }
+ }
+
+ this.height(size);
+ this.width(size);
+
+ if (typeof(user) === 'undefined') {
+ if (typeof(this.data('user')) !== 'undefined') {
+ user = this.data('user');
+ } else {
+ this.placeholder('x');
+ return;
+ }
+ }
+
+ // sanitize
+ user = user.replace(/\//g,'');
+
+ var $div = this;
+
+ OC.Router.registerLoadedCallback(function() {
+ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken;
+ $.get(url, function(result) {
+ if (typeof(result) === 'object') {
+ $div.placeholder(user);
+ } else {
+ if (ie8fix === true) {
+ $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
+ } else {
+ $div.html('<img src="'+url+'">');
+ }
+ }
+ });
+ });
+ };
+}(jQuery));
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index bafbd0e0e9f9dbe69f9f47e117a6b2aeef9c506f..f1836fd4727f7d09d8ed5c97e80d4d0f62d93149 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,7 +39,8 @@
return;
}
// Escape
- if(event.keyCode === 27 && self.options.closeOnEscape) {
+ if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+ event.stopImmediatePropagation();
self.close();
return false;
}
@@ -83,20 +84,21 @@
var self = this;
switch(key) {
case 'title':
- var $title = $('<h3 class="oc-dialog-title">' + this.options.title
- + '</h3>'); //<hr class="oc-dialog-separator" />');
if(this.$title) {
- this.$title.replaceWith($title);
+ this.$title.text(value);
} else {
+ var $title = $('<h3 class="oc-dialog-title">'
+ + value
+ + '</h3>');
this.$title = $title.prependTo(this.$dialog);
}
this._setSizes();
break;
case 'buttons':
- var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
if(this.$buttonrow) {
- this.$buttonrow.replaceWith($buttonrow);
+ this.$buttonrow.empty();
} else {
+ var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
this.$buttonrow = $buttonrow.appendTo(this.$dialog);
}
$.each(value, function(idx, val) {
@@ -124,6 +126,8 @@
$closeButton.on('click', function() {
self.close();
});
+ } else {
+ this.$dialog.find('.oc-dialog-close').remove();
}
break;
case 'width':
diff --git a/core/js/js.js b/core/js/js.js
index 1999ff73d235e2726019160bfb6a1627cc103745..c09f80369f921e7e5155448fce19d082ad946b62 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -321,6 +321,38 @@ var OC={
var date = new Date(1000*mtime);
return date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
},
+ /**
+ * Parses a URL query string into a JS map
+ * @param queryString query string in the format param1=1234¶m2=abcde¶m3=xyz
+ * @return map containing key/values matching the URL parameters
+ */
+ parseQueryString:function(queryString){
+ var parts,
+ components,
+ result = {},
+ key,
+ value;
+ if (!queryString){
+ return null;
+ }
+ if (queryString[0] === '?'){
+ queryString = queryString.substr(1);
+ }
+ parts = queryString.split('&');
+ for (var i = 0; i < parts.length; i++){
+ components = parts[i].split('=');
+ if (!components.length){
+ continue;
+ }
+ key = decodeURIComponent(components[0]);
+ if (!key){
+ continue;
+ }
+ value = components[1];
+ result[key] = value && decodeURIComponent(value);
+ }
+ return result;
+ },
/**
* Opens a popup with the setting for an app.
* @param appid String. The ID of the app e.g. 'calendar', 'contacts' or 'files'.
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 6b768641586b24583005af9adbce3495f91de909..8e8a477772b3859919b140351c142fe8498d8548 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -139,8 +139,12 @@ var OCdialogs = {
}
});
})
- .fail(function() {
- alert(t('core', 'Error loading file picker template'));
+ .fail(function(status, error) {
+ // If the method is called while navigating away
+ // from the page, it is probably not needed ;)
+ if(status !== 0) {
+ alert(t('core', 'Error loading file picker template: {error}', {error: error}));
+ }
});
},
/**
@@ -206,8 +210,14 @@ var OCdialogs = {
});
OCdialogs.dialogs_counter++;
})
- .fail(function() {
- alert(t('core', 'Error loading file picker template'));
+ .fail(function(status, error) {
+ // If the method is called while navigating away from
+ // the page, we still want to deliver the message.
+ if(status === 0) {
+ alert(title + ': ' + content);
+ } else {
+ alert(t('core', 'Error loading message template: {error}', {error: error}));
+ }
});
},
_getFilePickerTemplate: function() {
@@ -219,8 +229,8 @@ var OCdialogs = {
self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
defer.resolve(self.$filePickerTemplate);
})
- .fail(function() {
- defer.reject();
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$filePickerTemplate);
@@ -235,8 +245,8 @@ var OCdialogs = {
self.$messageTemplate = $(tmpl);
defer.resolve(self.$messageTemplate);
})
- .fail(function() {
- defer.reject();
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$messageTemplate);
@@ -244,9 +254,16 @@ var OCdialogs = {
return defer.promise();
},
_getFileList: function(dir, mimeType) {
+ if (typeof(mimeType) === "string") {
+ mimeType = [mimeType];
+ }
+
return $.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
- {dir: dir, mimetype: mimeType}
+ {
+ dir: dir,
+ mimetypes: JSON.stringify(mimeType)
+ }
);
},
_determineValue: function(element) {
diff --git a/core/js/share.js b/core/js/share.js
index 27c16f38b92d0d8da9d2e3b321efd68a3d884541..5d34faf8a5db15d9fb26aeee33903a49276247ac 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -233,6 +233,7 @@ OC.Share={
// } else {
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
if (result.status == 'success' && result.data.length > 0) {
+ $( "#shareWith" ).autocomplete( "option", "autoFocus", true );
response(result.data);
} else {
// Suggest sharing via email if valid email address
@@ -240,6 +241,7 @@ OC.Share={
// if (pattern.test(search.term)) {
// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
// } else {
+ $( "#shareWith" ).autocomplete( "option", "autoFocus", false );
response([t('core', 'No people found')]);
// }
}
@@ -423,7 +425,7 @@ OC.Share={
dateFormat : 'dd-mm-yy'
});
}
-}
+};
$(document).ready(function() {
@@ -512,7 +514,7 @@ $(document).ready(function() {
$(document).on('change', '#dropdown .permissions', function() {
if ($(this).attr('name') == 'edit') {
- var li = $(this).parent().parent()
+ var li = $(this).parent().parent();
var checkboxes = $('.permissions', li);
var checked = $(this).is(':checked');
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
diff --git a/core/l10n/ach.php b/core/l10n/ach.php
new file mode 100644
index 0000000000000000000000000000000000000000..25f1137e8cd8173b9e7c63d1baed29103ac33b5c
--- /dev/null
+++ b/core/l10n/ach.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index a77924b12186a35114b081973335a6f0dc6cbaac..c86af43ada64d1759c0d809ad1560ece76a7fdfb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
"group" => "grup",
+"Turned on maintenance mode" => "Activat el mode de manteniment",
+"Turned off maintenance mode" => "Desactivat el mode de manteniment",
+"Updated database" => "Actualitzada la base de dades",
+"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...",
+"Updated filecache" => "Actualitzada la memòria de cau dels fitxers",
+"... %d%% done ..." => "... %d%% fet ...",
"Category type not provided." => "No s'ha especificat el tipus de categoria.",
"No category to add?" => "No voleu afegir cap categoria?",
"This category already exists: %s" => "Aquesta categoria ja existeix: %s",
@@ -42,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "l'any passat",
"years ago" => "anys enrere",
"Choose" => "Escull",
-"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
"Yes" => "Sí",
"No" => "No",
"Ok" => "D'acord",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 1301dae32f38efae88d611e9d258f15e71dd2227..be7af770015c13dfcc471c9122dc531495f1baa4 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "před lety",
"Choose" => "Vybrat",
-"Error loading file picker template" => "Chyba při načítání šablony výběru souborů",
"Yes" => "Ano",
"No" => "Ne",
"Ok" => "Ok",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index abaea4ba6a5faa81671ced9bb0dc88650ac29d12..3fd0fff94efd17324cd0ae1c6481d26e5546fe19 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "sidste år",
"years ago" => "år siden",
"Choose" => "Vælg",
-"Error loading file picker template" => "Fejl ved indlæsning af filvælger skabelon",
"Yes" => "Ja",
"No" => "Nej",
"Ok" => "OK",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 1f205a9db5b75c2c59a2ac6dfe6db0f964ce240b..f248734d01cb7326c04fadce9f92909c5abc3e10 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 6e01b3e2083dcb370fd16864de73f1d9f66ffba6..5ac614b25758be9801d3dd5bc8895111d869fe83 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index a29fc4547c6ff598ddf93a9bfdc7cfc9e22f9a4b..4616f50c2be33e6784bba8403f3faae23ad1e944 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 54c13c89bfa20040274754ff349eac6801481620..6e0733b7060d546bc7df7c9e469f14c3a5ee9268 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
"Choose" => "Επιλέξτε",
-"Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου",
"Yes" => "Ναι",
"No" => "Όχι",
"Ok" => "Οκ",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 3a42872366af55fa32e9c198de365be3f9be68ad..7ccdcbe532737935cf77b33c0dffea512e8f8efa 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "last year",
"years ago" => "years ago",
"Choose" => "Choose",
-"Error loading file picker template" => "Error loading file picker template",
"Yes" => "Yes",
"No" => "No",
"Ok" => "OK",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 077f677e972adcc6f472088e34ccc7fa0e08e9c6..a38050bccc2016f3eb6b52805a5e6a20f860299d 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,7 +1,13 @@
<?php
$TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compatido »%s« contigo",
+"%s shared »%s« with you" => "%s ha compatido »%s« contigo",
"group" => "grupo",
+"Turned on maintenance mode" => "Modo mantenimiento activado",
+"Turned off maintenance mode" => "Modo mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
"Category type not provided." => "Tipo de categoría no proporcionado.",
"No category to add?" => "¿Ninguna categoría para añadir?",
"This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -30,31 +36,30 @@ $TRANSLATIONS = array(
"November" => "Noviembre",
"December" => "Diciembre",
"Settings" => "Ajustes",
-"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"seconds ago" => "segundos antes",
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
-"months ago" => "hace meses",
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
+"months ago" => "meses antes",
"last year" => "el año pasado",
-"years ago" => "hace años",
+"years ago" => "años antes",
"Choose" => "Seleccionar",
-"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
"Yes" => "Sí",
"No" => "No",
"Ok" => "Aceptar",
"The object type is not specified." => "El tipo de objeto no está especificado.",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no está especificado.",
-"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
+"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!",
"Shared" => "Compartido",
"Share" => "Compartir",
-"Error while sharing" => "Error mientras comparte",
-"Error while unsharing" => "Error mientras se deja de compartir",
-"Error while changing permissions" => "Error mientras se cambia permisos",
+"Error while sharing" => "Error al compartir",
+"Error while unsharing" => "Error al dejar de compartir",
+"Error while changing permissions" => "Error al cambiar permisos",
"Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
"Shared with you by {owner}" => "Compartido contigo por {owner}",
"Share with" => "Compartir con",
@@ -84,6 +89,7 @@ $TRANSLATIONS = array(
"Email sent" => "Correo electrónico enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
@@ -101,9 +107,9 @@ $TRANSLATIONS = array(
"Apps" => "Aplicaciones",
"Admin" => "Administración",
"Help" => "Ayuda",
-"Access forbidden" => "Acceso prohibido",
+"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se encuentra la nube",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!",
"Edit categories" => "Editar categorías",
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
@@ -127,13 +133,13 @@ $TRANSLATIONS = array(
"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
"Log out" => "Salir",
"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
-"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
+"If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
"Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
"Lost your password?" => "¿Ha perdido su contraseña?",
"remember" => "recordar",
"Log in" => "Entrar",
"Alternative Logins" => "Inicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!",
"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 389251de8aa0f0d5e1f3e41856c9074e860c21df..2c699266c516149abc05a4e519567345ef547a8b 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
"group" => "grupo",
+"Turned on maintenance mode" => "Modo de mantenimiento activado",
+"Turned off maintenance mode" => "Modo de mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
"Category type not provided." => "Tipo de categoría no provisto. ",
"No category to add?" => "¿Ninguna categoría para añadir?",
"This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -31,18 +37,17 @@ $TRANSLATIONS = array(
"December" => "diciembre",
"Settings" => "Configuración",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
"Choose" => "Elegir",
-"Error loading file picker template" => "Error al cargar la plantilla del seleccionador de archivos",
"Yes" => "Sí",
"No" => "No",
"Ok" => "Aceptar",
@@ -84,6 +89,7 @@ $TRANSLATIONS = array(
"Email sent" => "e-mail mandado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
@@ -108,9 +114,11 @@ $TRANSLATIONS = array(
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..93c8e33f3e2d95d19676fafd4be3416cee37855d
--- /dev/null
+++ b/core/l10n/es_MX.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 5391a144349331821c7cd0c8dfa2466d5b6546e8..59c8e77a389b0479517afb245361721331cf90db 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
"Choose" => "Vali",
-"Error loading file picker template" => "Viga failivalija malli laadimisel",
"Yes" => "Jah",
"No" => "Ei",
"Ok" => "Ok",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 1e0eb36e1e3f160e0fb0f5af2d54300242048e7d..1c11caee9e8cb742973f668c0f69762229395ac3 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "joan den urtean",
"years ago" => "urte",
"Choose" => "Aukeratu",
-"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
"Yes" => "Bai",
"No" => "Ez",
"Ok" => "Ados",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 82356c0ab12d80267fae4c112e713b77b0e0ac39..b0423577b0caa9fdc16b73901c390cfafa712050 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "سال قبل",
"years ago" => "سالهای قبل",
"Choose" => "انتخاب کردن",
-"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
"Yes" => "بله",
"No" => "نه",
"Ok" => "قبول",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 0f338a093405768698d47fefc5ae81900e5f1e74..8b8b7c19f2a46d6e5d11dcc8bd6ac7395b24bc62 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"Choose" => "Choisir",
-"Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier",
"Yes" => "Oui",
"No" => "Non",
"Ok" => "Ok",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 663d769ee98851a6a9f21699799a2080e778491d..ca07e510a30178391f58896effe66c295f51b52b 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escoller",
-"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
"Yes" => "Si",
"No" => "Non",
"Ok" => "Aceptar",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d5d83fea33012f607ef201abef30095b9cabe858..a10765c3a80603d1e2da93c3f4f0d2ae43701173 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "שנה שעברה",
"years ago" => "שנים",
"Choose" => "בחירה",
-"Error loading file picker template" => "שגיאה בטעינת תבנית בחירת הקבצים",
"Yes" => "כן",
"No" => "לא",
"Ok" => "בסדר",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 93f96e17847f1247b834c14d603a9c7dad8c6364..92e51d977efa6d336455d4af8282e35efcfa6f02 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "tavaly",
"years ago" => "több éve",
"Choose" => "Válasszon",
-"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
"Yes" => "Igen",
"No" => "Nem",
"Ok" => "Ok",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 71f6ffdf50ea58f53500c50fd3d7edb07e9f317f..a8f9a6901f84f02f2a2c72ad1924636cac6c287f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "anno scorso",
"years ago" => "anni fa",
"Choose" => "Scegli",
-"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
"Yes" => "Sì",
"No" => "No",
"Ok" => "Ok",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 82e4153367d3182e7ebcf37ce0b21b41500620c5..343fffd09b06e47ddc654f3f9cc0eaf0a249e501 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "一年前",
"years ago" => "年前",
"Choose" => "選択",
-"Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
"Yes" => "はい",
"No" => "いいえ",
"Ok" => "OK",
diff --git a/core/l10n/km.php b/core/l10n/km.php
new file mode 100644
index 0000000000000000000000000000000000000000..556cca20dac815a4de6b07d0e85de9636715742e
--- /dev/null
+++ b/core/l10n/km.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index a2a0ff22ef618237418f2416e42b223af963d2d1..5ce6ce9c821e3e634ca3d51e5500da3c9839b581 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"_%n day ago_::_%n days ago_" => array("",""),
"_%n month ago_::_%n months ago_" => array("",""),
"Error" => "ههڵه",
+"Share" => "هاوبەشی کردن",
"Password" => "وشەی تێپەربو",
"Username" => "ناوی بهکارهێنهر",
"New password" => "وشەی نهێنی نوێ",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 5f4c415bed798ff100092a2fa754d438a3e999f7..6a0b41b667971fbae287e69d68996ff5088b4094 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
"Choose" => "Auswielen",
-"Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
"Yes" => "Jo",
"No" => "Nee",
"Ok" => "OK",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 7b0c3ed4f80a02f2b0b9ff36147bcd108423416e..7b5ad39b81ef074eb6f4038db2a4d409b62e19be 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
"group" => "grupė",
+"Turned on maintenance mode" => "Įjungta priežiūros veiksena",
+"Turned off maintenance mode" => "Išjungta priežiūros veiksena",
+"Updated database" => "Atnaujinta duomenų bazė",
+"Updating filecache, this may take really long..." => "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai...",
+"Updated filecache" => "Atnaujinta failų talpykla",
+"... %d%% done ..." => "... %d%% atlikta ...",
"Category type not provided." => "Kategorija nenurodyta.",
"No category to add?" => "Nepridėsite jokios kategorijos?",
"This category already exists: %s" => "Ši kategorija jau egzistuoja: %s",
@@ -35,14 +41,13 @@ $TRANSLATIONS = array(
"_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"),
"today" => "šiandien",
"yesterday" => "vakar",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("prieš %n dieną","prieš %n dienas","prieš %n dienų"),
"last month" => "praeitą mėnesį",
"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
"Choose" => "Pasirinkite",
-"Error loading file picker template" => "Klaida pakraunant failų naršyklę",
"Yes" => "Taip",
"No" => "Ne",
"Ok" => "Gerai",
@@ -61,6 +66,7 @@ $TRANSLATIONS = array(
"Share with link" => "Dalintis nuoroda",
"Password protect" => "Apsaugotas slaptažodžiu",
"Password" => "Slaptažodis",
+"Allow Public Upload" => "Leisti viešą įkėlimą",
"Email link to person" => "Nusiųsti nuorodą paštu",
"Send" => "Siųsti",
"Set expiration date" => "Nustatykite galiojimo laiką",
@@ -89,6 +95,7 @@ $TRANSLATIONS = array(
"Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?",
"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
"Username" => "Prisijungimo vardas",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
"Request reset" => "Prašyti nustatymo iš najo",
"Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
@@ -102,13 +109,16 @@ $TRANSLATIONS = array(
"Help" => "Pagalba",
"Access forbidden" => "Priėjimas draudžiamas",
"Cloud not found" => "Negalima rasti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!",
"Edit categories" => "Redaguoti kategorijas",
"Add" => "Pridėti",
"Security Warning" => "Saugumo pranešimas",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
"Advanced" => "Išplėstiniai",
"Data folder" => "Duomenų katalogas",
@@ -129,6 +139,7 @@ $TRANSLATIONS = array(
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"Alternative Logins" => "Alternatyvūs prisijungimai",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>Linkėjimai!",
"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 57b9186f3cfc4e74a09c83607fd4739c80d334e2..465a497e8800a84a188e7cc224c2974fb8c12915 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
"Choose" => "Izvēlieties",
-"Error loading file picker template" => "Kļūda ielādējot datņu ņēmēja veidni",
"Yes" => "Jā",
"No" => "Nē",
"Ok" => "Labi",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 6d5d5dc9917faaf5682f90918ebc2d8f288eda89..e181eee702ab547f7cab164f379300ff61688fea 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Choose" => "Kies",
-"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
"Yes" => "Ja",
"No" => "Nee",
"Ok" => "Ok",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 942824ecb743f30d1b9acb6eb04a1ca056742b98..86c46471a1413412778722ed0c971bfd986df751 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s delte «%s» med deg",
"group" => "gruppe",
+"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
+"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
+"Updated database" => "Database oppdatert",
+"Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …",
+"Updated filecache" => "Mellomlager oppdatert",
+"... %d%% done ..." => "… %d %% ferdig …",
"Category type not provided." => "Ingen kategoritype.",
"No category to add?" => "Ingen kategori å leggja til?",
"This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -30,13 +37,13 @@ $TRANSLATIONS = array(
"December" => "Desember",
"Settings" => "Innstillingar",
"seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minutt sidan","%n minutt sidan"),
+"_%n hour ago_::_%n hours ago_" => array("%n time sidan","%n timar sidan"),
"today" => "i dag",
"yesterday" => "i går",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dag sidan","%n dagar sidan"),
"last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
"months ago" => "månadar sidan",
"last year" => "i fjor",
"years ago" => "år sidan",
@@ -59,6 +66,7 @@ $TRANSLATIONS = array(
"Share with link" => "Del med lenkje",
"Password protect" => "Passordvern",
"Password" => "Passord",
+"Allow Public Upload" => "Tillat offentleg opplasting",
"Email link to person" => "Send lenkja over e-post",
"Send" => "Send",
"Set expiration date" => "Set utløpsdato",
@@ -81,11 +89,14 @@ $TRANSLATIONS = array(
"Email sent" => "E-post sendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+"%s password reset" => "%s passordnullstilling",
"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
"Username" => "Brukarnamn",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
"Request reset" => "Be om nullstilling",
"Your password was reset" => "Passordet ditt er nullstilt",
"To login page" => "Til innloggingssida",
@@ -98,13 +109,16 @@ $TRANSLATIONS = array(
"Help" => "Hjelp",
"Access forbidden" => "Tilgang forbudt",
"Cloud not found" => "Fann ikkje skyen",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!",
"Edit categories" => "Endra kategoriar",
"Add" => "Legg til",
"Security Warning" => "Tryggleiksåtvaring",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
@@ -125,6 +139,7 @@ $TRANSLATIONS = array(
"remember" => "hugs",
"Log in" => "Logg inn",
"Alternative Logins" => "Alternative innloggingar",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<",
"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..556cca20dac815a4de6b07d0e85de9636715742e
--- /dev/null
+++ b/core/l10n/nqo.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 48f6dff61848352ef95e86cb4340559391b46084..deb4b4c81c813b43459513be889710071618004b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
"group" => "grupa",
+"Turned on maintenance mode" => "Włączony tryb konserwacji",
+"Turned off maintenance mode" => "Wyłączony tryb konserwacji",
+"Updated database" => "Zaktualizuj bazę",
+"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...",
+"Updated filecache" => "Zaktualizuj filecache",
+"... %d%% done ..." => "... %d%% udane ...",
"Category type not provided." => "Nie podano typu kategorii.",
"No category to add?" => "Brak kategorii do dodania?",
"This category already exists: %s" => "Ta kategoria już istnieje: %s",
@@ -31,18 +37,17 @@ $TRANSLATIONS = array(
"December" => "Grudzień",
"Settings" => "Ustawienia",
"seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
+"_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"),
"today" => "dziś",
"yesterday" => "wczoraj",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
"last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
"Choose" => "Wybierz",
-"Error loading file picker template" => "Błąd podczas ładowania pliku wybranego szablonu",
"Yes" => "Tak",
"No" => "Nie",
"Ok" => "OK",
@@ -84,6 +89,7 @@ $TRANSLATIONS = array(
"Email sent" => "E-mail wysłany",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+"%s password reset" => "%s reset hasła",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 84762cde5e40cf038d2d975d0a6039f3065ddacb..f758c0e9bc36a40e128954d4df36f41363e6ba61 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartilhou »%s« com você",
"group" => "grupo",
+"Turned on maintenance mode" => "Ativar modo de manutenção",
+"Turned off maintenance mode" => "Desligar o modo de manutenção",
+"Updated database" => "Atualizar o banco de dados",
+"Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...",
+"Updated filecache" => "Atualizar cache de arquivo",
+"... %d%% done ..." => "... %d%% concluído ...",
"Category type not provided." => "Tipo de categoria não fornecido.",
"No category to add?" => "Nenhuma categoria a adicionar?",
"This category already exists: %s" => "Esta categoria já existe: %s",
@@ -31,18 +37,17 @@ $TRANSLATIONS = array(
"December" => "dezembro",
"Settings" => "Ajustes",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array(" ha %n minuto","ha %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("ha %n hora","ha %n horas"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("ha %n dia","ha %n dias"),
"last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
"Yes" => "Sim",
"No" => "Não",
"Ok" => "Ok",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 2afb9ef9b39f2a86b9aef97de6b2ad9e5f78cbd8..4554b64d4054f80feb7cff996747c04f865efa81 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s partilhado »%s« contigo",
"group" => "grupo",
+"Turned on maintenance mode" => "Activado o modo de manutenção",
+"Turned off maintenance mode" => "Desactivado o modo de manutenção",
+"Updated database" => "Base de dados actualizada",
+"Updating filecache, this may take really long..." => "A actualizar o cache dos ficheiros, poderá demorar algum tempo...",
+"Updated filecache" => "Actualizado o cache dos ficheiros",
+"... %d%% done ..." => "... %d%% feito ...",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
"This category already exists: %s" => "A categoria já existe: %s",
@@ -31,18 +37,17 @@ $TRANSLATIONS = array(
"December" => "Dezembro",
"Settings" => "Configurações",
"seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minuto atrás","%n minutos atrás"),
+"_%n hour ago_::_%n hours ago_" => array("%n hora atrás","%n horas atrás"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dia atrás","%n dias atrás"),
"last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
"Yes" => "Sim",
"No" => "Não",
"Ok" => "Ok",
@@ -84,6 +89,7 @@ $TRANSLATIONS = array(
"Email sent" => "E-mail enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
+"%s password reset" => "%s reposição da password",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index ca0e409f71f5e05fbb0ef42a1f1a075097d31a91..8b274cb140942ebb6bfaf0dec8932a767d54adaa 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "ultimul an",
"years ago" => "ani în urmă",
"Choose" => "Alege",
-"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
"Yes" => "Da",
"No" => "Nu",
"Ok" => "Ok",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index d79326aff326034384e59699fdd12d7bade85389..0fe2e860917be03175b5893e4c1b346899fec712 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
"Choose" => "Выбрать",
-"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
"Yes" => "Да",
"No" => "Нет",
"Ok" => "Ок",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index ed061068b4b00e0fdf69d8b3c3ebf8a9a995bc13..f36445950a14c2b8154c1cdc729e281ab8511693 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "pred rokmi",
"Choose" => "Výber",
-"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
"Yes" => "Áno",
"No" => "Nie",
"Ok" => "Ok",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 460ca99eeabfb48deea6f9472e9f8df48afc375b..e88b7a6fb5ac8fc534b9b1b5321318ed25f75a19 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -42,7 +42,6 @@ $TRANSLATIONS = array(
"last year" => "lansko leto",
"years ago" => "let nazaj",
"Choose" => "Izbor",
-"Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
"Yes" => "Da",
"No" => "Ne",
"Ok" => "V redu",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 3057ac2c6896643d0e28a8d9b9108a4614a15543..c8462573ffa0f7b613c43b9d048eefbe62b82b27 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,5 +1,13 @@
<?php
$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s ndau »%s« me ju",
+"group" => "grupi",
+"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
+"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
+"Updated database" => "Database-i u azhurnua",
+"Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...",
+"Updated filecache" => "Memorja e skedarëve u azhornua",
+"... %d%% done ..." => "... %d%% u krye ...",
"Category type not provided." => "Mungon tipi i kategorisë.",
"No category to add?" => "Asnjë kategori për të shtuar?",
"This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
@@ -29,18 +37,17 @@ $TRANSLATIONS = array(
"December" => "Dhjetor",
"Settings" => "Parametra",
"seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minut më parë","%n minuta më parë"),
+"_%n hour ago_::_%n hours ago_" => array("%n orë më parë","%n orë më parë"),
"today" => "sot",
"yesterday" => "dje",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n ditë më parë","%n ditë më parë"),
"last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Choose" => "Zgjidh",
-"Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve",
"Yes" => "Po",
"No" => "Jo",
"Ok" => "Në rregull",
@@ -82,11 +89,13 @@ $TRANSLATIONS = array(
"Email sent" => "Email-i u dërgua",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+"%s password reset" => "Kodi i %s -it u rivendos",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
"Username" => "Përdoruesi",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
"Request reset" => "Bëj kërkesë për rivendosjen",
"Your password was reset" => "Kodi yt u rivendos",
@@ -105,9 +114,11 @@ $TRANSLATIONS = array(
"Add" => "Shto",
"Security Warning" => "Paralajmërim sigurie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjë krijues numrash të rastësishëm, ju lutem aktivizoni shtesën PHP OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa një krijues numrash të rastësishëm të sigurt një person i huaj mund të jetë në gjendje të parashikojë kodin dhe të marri llogarinë tuaj.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
"Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
"Advanced" => "Të përparuara",
"Data folder" => "Emri i dosjes",
@@ -119,6 +130,7 @@ $TRANSLATIONS = array(
"Database tablespace" => "Tablespace-i i database-it",
"Database host" => "Pozicioni (host) i database-it",
"Finish setup" => "Mbaro setup-in",
+"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
"Log out" => "Dalje",
"Automatic logon rejected!" => "Hyrja automatike u refuzua!",
"If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.",
@@ -127,6 +139,7 @@ $TRANSLATIONS = array(
"remember" => "kujto",
"Log in" => "Hyrje",
"Alternative Logins" => "Hyrje alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!",
"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 9bfd91d2691846ab1b7fb7d851b33dabae15bc05..b358fdc8a97ced5a7efab7a65e09f3ccf5a69169 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "förra året",
"years ago" => "år sedan",
"Choose" => "Välj",
-"Error loading file picker template" => "Fel vid inläsning av filväljarens mall",
"Yes" => "Ja",
"No" => "Nej",
"Ok" => "Ok",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 8b6c261d64ce95512291790a091a962c60cd0154..a4c80638d82bdaacd33b5f9994eeb987ec4bf64c 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
"group" => "grup",
+"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
+"Turned off maintenance mode" => "Bakım kipi kapatıldı",
+"Updated database" => "Veritabanı güncellendi",
+"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.",
+"Updated filecache" => "Dosya önbelleği güncellendi",
+"... %d%% done ..." => "%%%d tamamlandı ...",
"Category type not provided." => "Kategori türü girilmedi.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: %s" => "Bu kategori zaten mevcut: %s",
@@ -42,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "geçen yıl",
"years ago" => "yıl önce",
"Choose" => "seç",
-"Error loading file picker template" => "Seçici şablon dosya yüklemesinde hata",
"Yes" => "Evet",
"No" => "Hayır",
"Ok" => "Tamam",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index ddcc902c8d78646f6d24ec04eb5c53b559782ee7..ce61618111a70ebfaae5f6e8660d7b98efda895b 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "去年",
"years ago" => "年前",
"Choose" => "选择(&C)...",
-"Error loading file picker template" => "加载文件选择器模板出错",
"Yes" => "是",
"No" => "否",
"Ok" => "好",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index c25a58dc8ead3855e0427b2a4aa059e9d5937f15..a6e2588e0d70ad645a744a530a5729d34cd2039b 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "去年",
"years ago" => "幾年前",
"Choose" => "選擇",
-"Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
"Yes" => "是",
"No" => "否",
"Ok" => "好",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 74a5be2b96f002c4dcd28ccef8f4214d4a4563c3..3c8099591a111891c2d9a58fbfe4134207c05a59 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -5,11 +5,12 @@
* later.
* See the COPYING-README file.
*/
+namespace OC\Core\LostPassword;
-class OC_Core_LostPassword_Controller {
+class Controller {
protected static function displayLostPasswordPage($error, $requested) {
- $isEncrypted = OC_App::isEnabled('files_encryption');
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
+ $isEncrypted = \OC_App::isEnabled('files_encryption');
+ \OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
array('error' => $error,
'requested' => $requested,
'isEncrypted' => $isEncrypted));
@@ -19,12 +20,12 @@ class OC_Core_LostPassword_Controller {
$route_args = array();
$route_args['token'] = $args['token'];
$route_args['user'] = $args['user'];
- OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
+ \OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
array('success' => $success, 'args' => $route_args));
}
protected static function checkToken($user, $token) {
- return OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
+ return \OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
}
public static function index($args) {
@@ -33,7 +34,7 @@ class OC_Core_LostPassword_Controller {
public static function sendEmail($args) {
- $isEncrypted = OC_App::isEnabled('files_encryption');
+ $isEncrypted = \OC_App::isEnabled('files_encryption');
if(!$isEncrypted || isset($_POST['continue'])) {
$continue = true;
@@ -41,26 +42,26 @@ class OC_Core_LostPassword_Controller {
$continue = false;
}
- if (OC_User::userExists($_POST['user']) && $continue) {
- $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
- OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
+ if (\OC_User::userExists($_POST['user']) && $continue) {
+ $token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', ''));
+ \OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
hash('sha256', $token)); // Hash the token again to prevent timing attacks
- $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
+ $email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
if (!empty($email)) {
- $link = OC_Helper::linkToRoute('core_lostpassword_reset',
+ $link = \OC_Helper::linkToRoute('core_lostpassword_reset',
array('user' => $_POST['user'], 'token' => $token));
- $link = OC_Helper::makeURLAbsolute($link);
+ $link = \OC_Helper::makeURLAbsolute($link);
- $tmpl = new OC_Template('core/lostpassword', 'email');
+ $tmpl = new \OC_Template('core/lostpassword', 'email');
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
- $l = OC_L10N::get('core');
- $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
+ $l = \OC_L10N::get('core');
+ $from = \OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
try {
- $defaults = new OC_Defaults();
- OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
+ $defaults = new \OC_Defaults();
+ \OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
} catch (Exception $e) {
- OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+ \OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
}
self::displayLostPasswordPage(false, true);
} else {
@@ -84,9 +85,9 @@ class OC_Core_LostPassword_Controller {
public static function resetPassword($args) {
if (self::checkToken($args['user'], $args['token'])) {
if (isset($_POST['password'])) {
- if (OC_User::setPassword($args['user'], $_POST['password'])) {
- OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
- OC_User::unsetMagicInCookie();
+ if (\OC_User::setPassword($args['user'], $_POST['password'])) {
+ \OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
+ \OC_User::unsetMagicInCookie();
self::displayResetPasswordPage(true, $args);
} else {
self::displayResetPasswordPage(false, $args);
diff --git a/core/minimizer.php b/core/minimizer.php
index 4da9037c41308afeeae59a09cd2bfd27051fc49f..eeeddf86a814be9aa10528daf1b7b64b13b4e3e5 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -5,11 +5,11 @@ OC_App::loadApps();
if ($service == 'core.css') {
$minimizer = new OC_Minimizer_CSS();
- $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
+ $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles);
$minimizer->output($files, $service);
}
else if ($service == 'core.js') {
$minimizer = new OC_Minimizer_JS();
- $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
+ $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts);
$minimizer->output($files, $service);
}
diff --git a/core/routes.php b/core/routes.php
index f0f8ce571e22834d915081bef33aca5b41a8a58b..57e25c0f1f7371576aeeece169f8225941b2d116 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -44,19 +44,35 @@ $this->create('core_ajax_routes', '/core/routes.json')
->action('OC_Router', 'JSRoutes');
$this->create('core_ajax_preview', '/core/preview.png')
->actionInclude('core/ajax/preview.php');
-OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
$this->create('core_lostpassword_index', '/lostpassword/')
->get()
- ->action('OC_Core_LostPassword_Controller', 'index');
+ ->action('OC\Core\LostPassword\Controller', 'index');
$this->create('core_lostpassword_send_email', '/lostpassword/')
->post()
- ->action('OC_Core_LostPassword_Controller', 'sendEmail');
+ ->action('OC\Core\LostPassword\Controller', 'sendEmail');
$this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
->get()
- ->action('OC_Core_LostPassword_Controller', 'reset');
+ ->action('OC\Core\LostPassword\Controller', 'reset');
$this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
->post()
- ->action('OC_Core_LostPassword_Controller', 'resetPassword');
+ ->action('OC\Core\LostPassword\Controller', 'resetPassword');
+
+// Avatar routes
+$this->create('core_avatar_get_tmp', '/avatar/tmp')
+ ->get()
+ ->action('OC\Core\Avatar\Controller', 'getTmpAvatar');
+$this->create('core_avatar_get', '/avatar/{user}/{size}')
+ ->get()
+ ->action('OC\Core\Avatar\Controller', 'getAvatar');
+$this->create('core_avatar_post', '/avatar/')
+ ->post()
+ ->action('OC\Core\Avatar\Controller', 'postAvatar');
+$this->create('core_avatar_delete', '/avatar/')
+ ->delete()
+ ->action('OC\Core\Avatar\Controller', 'deleteAvatar');
+$this->create('core_avatar_post_cropped', '/avatar/cropped')
+ ->post()
+ ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
// Not specifically routed
$this->create('app_css', '/apps/{app}/{file}')
diff --git a/core/setup.php b/core/setup.php
index 40e30db533aaca594be9586975a22eeadebd22b1..4758c23b045ea214bdb8048258cf4e3b024aee7f 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -33,8 +33,8 @@ $opts = array(
'hasOracle' => $hasOracle,
'hasMSSQL' => $hasMSSQL,
'directory' => $datadir,
- 'secureRNG' => OC_Util::secureRNG_available(),
- 'htaccessWorking' => OC_Util::ishtaccessworking(),
+ 'secureRNG' => OC_Util::secureRNGAvailable(),
+ 'htaccessWorking' => OC_Util::isHtAccessWorking(),
'vulnerableToNullByte' => $vulnerableToNullByte,
'errors' => array(),
);
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 1e0f4a75c3cb1a8e7ca269a2320be61886f9b772..71bec11d219b7bfb342a413f76b729f8a8e3095c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,6 +49,9 @@
<span id="expand" tabindex="0" role="link">
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
<img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
+ <?php if ($_['enableAvatars']): ?>
+ <div class="avatardiv"></div>
+ <?php endif; ?>
</span>
<div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
diff --git a/index.php b/index.php
index 90fd3efcc96e060e5f31875e6b7f12e03791e3f6..40063fa6e05b44305807b88926d331e6477b5bba 100755
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@ try {
} catch (Exception $ex) {
//show the user a detailed error page
- OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('index', $ex->getMessage(), \OCP\Util::FATAL);
+ OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
OC_Template::printExceptionErrorPage($ex);
}
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..f61d3994eea526a6a7a49ea25ed308ac04c71212
--- /dev/null
+++ b/l10n/ach/core.po
@@ -0,0 +1,671 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:387
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:853
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:854
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:855
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:856
+msgid "today"
+msgstr ""
+
+#: js/js.js:857
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:858
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:859
+msgid "last month"
+msgstr ""
+
+#: js/js.js:860
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:861
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:862
+msgid "last year"
+msgstr ""
+
+#: js/js.js:863
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:645 js/share.js:657
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:131 js/share.js:685
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr ""
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:245
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:352
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:354
+msgid "access control"
+msgstr ""
+
+#: js/share.js:357
+msgid "create"
+msgstr ""
+
+#: js/share.js:360
+msgid "update"
+msgstr ""
+
+#: js/share.js:363
+msgid "delete"
+msgstr ""
+
+#: js/share.js:366
+msgid "share"
+msgstr ""
+
+#: js/share.js:400 js/share.js:632
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:645
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:657
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:672
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:683
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:37
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..1edc94cfa5f557056fd497ac67b4fc7fecd70d30
--- /dev/null
+++ b/l10n/ach/files.po
@@ -0,0 +1,335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:165
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:239
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:244 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:192
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:307
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:432
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:563
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:628
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:563 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:564 templates/index.php:81
+msgid "Size"
+msgstr ""
+
+#: js/files.js:565 templates/index.php:83
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:88 templates/index.php:89
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:94 templates/index.php:95
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:108
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:110
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:118
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..bc509f34dc4b245fbcf598e1d6de38a523e2de20
--- /dev/null
+++ b/l10n/ach/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:250
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3808f1199dc8ce74917312c2f127cdbe10bbdbe
--- /dev/null
+++ b/l10n/ach/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:457
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6aa642bca6eef26a044405f4f83c96f91a169df
--- /dev/null
+++ b/l10n/ach/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..327f892ea05e9bb711c58a3faea0436fe8886671
--- /dev/null
+++ b/l10n/ach/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ach/files_versions.po b/l10n/ach/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..71bc81dabab19682cb7ead6ffc58a6766db1521c
--- /dev/null
+++ b/l10n/ach/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..efa6747b0fb17c06e3b730b49f090a382bfd0d76
--- /dev/null
+++ b/l10n/ach/lib.po
@@ -0,0 +1,334 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
+msgid "Help"
+msgstr ""
+
+#: app.php:374
+msgid "Personal"
+msgstr ""
+
+#: app.php:385
+msgid "Settings"
+msgstr ""
+
+#: app.php:397
+msgid "Users"
+msgstr ""
+
+#: app.php:410
+msgid "Admin"
+msgstr ""
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr ""
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:99
+msgid "today"
+msgstr ""
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr ""
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:104
+msgid "last year"
+msgstr ""
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr ""
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..391035008ee3f35e4348441a1cee7b1cda2d9d90
--- /dev/null
+++ b/l10n/ach/settings.po
@@ -0,0 +1,572 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: 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
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:284
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:277
+msgid "add group"
+msgstr ""
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:246 templates/personal.php:164
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c2514234b3303e0ad50bc7a99a7b9749996090b
--- /dev/null
+++ b/l10n/ach/user_ldap.po
@@ -0,0 +1,406 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr ""
diff --git a/l10n/ach/user_webdavauth.po b/l10n/ach/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..f4fa10e1a4eb9e8bead981c6428bf8f3488f1f9f
--- /dev/null
+++ b/l10n/ach/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index bf1d8334e31a388a14504a444e049752a6d088fc..67360d8c1077fd63e0e50fab7358ba68d759880a 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "Persoonlik"
msgid "Users"
msgstr "Gebruikers"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Toepassings"
@@ -600,7 +624,7 @@ msgstr "Maak opstelling klaar"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Teken uit"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index a51530f213fa95a095d6e7a11a7db8c90f8f1290..1aa1c35c8b1ee28915a194ba056806db07574b98 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 7ecb600f305bf3680b1f5f46c97c9c29be9c5a0a..39af3220442c403183158ba0f65840b4923d0aa8 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Gebruikers"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webdienste onder jou beheer"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 97f1665f351849889ce24f51cb14f835a03c7a8c..a7e66145986c34f46b9c8e96ddb722dab73a1df1 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Wagwoord"
@@ -438,7 +442,7 @@ msgstr "Nuwe wagwoord"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Gebruikersnaam"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index b4f237d610944c50290306287d7b46986a053000..4c25c9eb18781e7f90a6a04c6c49dceb14071d9c 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 47fc1f257109507d7e759845dc7b83c497badb92..362057faca756ea5fb26a60e32bb87cc54b81a86 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "لم يتم اختيار فئة للحذف"
msgid "Error removing %s from favorites."
msgstr "خطأ في حذف %s من المفضلة"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "الاحد"
@@ -166,15 +186,15 @@ msgstr "تشرين الثاني"
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -184,7 +204,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -194,15 +214,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "اليوم"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -212,11 +232,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -226,15 +246,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "سنة مضت"
@@ -242,22 +262,26 @@ msgstr "سنة مضت"
msgid "Choose"
msgstr "اختيار"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "موافق"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -267,7 +291,7 @@ msgstr "نوع العنصر غير محدد."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خطأ"
@@ -287,7 +311,7 @@ msgstr "مشارك"
msgid "Share"
msgstr "شارك"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "حصل خطأ عند عملية المشاركة"
@@ -343,67 +367,67 @@ msgstr "تعيين تاريخ إنتهاء الصلاحية"
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاحية"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "لا يسمح بعملية إعادة المشاركة"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "شورك في {item} مع {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "إنشاء"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "تحديث"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "حذف"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "مشاركة"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "محمي بكلمة السر"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
@@ -418,7 +442,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -487,7 +511,7 @@ msgstr "شخصي"
msgid "Users"
msgstr "المستخدمين"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "التطبيقات"
@@ -616,7 +640,7 @@ msgstr "انهاء التعديلات"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "الخروج"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 39c537e3a5d1192f568a189f79eaf36494bdc32c..565d98c14c1351c818b33e6a945c6e0284333c26 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 13:30+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: ibrahim_9090 <ibrahim9090@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index af3920e09499ac03765d95339b031c0e5a525eb6..df2684b93db32385abb7beb322abfc3880ccb511 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s شارك المجلد %s معك"
msgid "%s shared the file %s with you"
msgstr "%s شارك الملف %s معك"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "تحميل"
@@ -75,6 +75,6 @@ msgstr "رفع"
msgid "Cancel upload"
msgstr "إلغاء رفع الملفات"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "لا يوجد عرض مسبق لـ"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 849305d0f32f0bd8b9642a324971805d59b36624..0cc9b5b1c8c730a7b61bd052c39509739e9e903c 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "المستخدمين"
msgid "Admin"
msgstr "المدير"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "خدمات الشبكة تحت سيطرتك"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بم
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "منذ ثواني"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -278,7 +290,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -288,15 +300,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "اليوم"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "يوم أمس"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -306,11 +318,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "الشهر الماضي"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -320,11 +332,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "السنةالماضية"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "سنة مضت"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a3d217bb4e9e4e87ec8684668b1bda4c62f61f44..89f4050805f3e11be65d8184a5ceabb622d344e4 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "فشل إزالة المستخدم من المجموعة %s"
msgid "Couldn't update app."
msgstr "تعذر تحديث التطبيق."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "تم التحديث الى "
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "إيقاف"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "تفعيل"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "الرجاء الانتظار ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "جاري التحديث ..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "حصل خطأ أثناء تحديث التطبيق"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خطأ"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "حدث"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "تم التحديث بنجاح"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "جاري الحفظ..."
@@ -148,16 +152,16 @@ msgstr "تراجع"
msgid "Unable to remove user"
msgstr "تعذر حذف المستخدم"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "إلغاء"
@@ -177,7 +181,7 @@ msgstr "حصل خطأ اثناء انشاء مستخدم"
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صحيحة"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "المزيد"
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "ابدأ خطوات بداية التشغيل من جديد"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "كلمة المرور"
@@ -438,7 +442,7 @@ msgstr "كلمات سر جديدة"
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "اسم الحساب"
@@ -454,38 +458,66 @@ msgstr "عنوانك البريدي"
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "اللغة"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "ساعد في الترجمه"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "التشفير"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "وحدة التخزين الافتراضية"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "غير محدود"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "شيء آخر"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "إسم المستخدم"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "وحدة التخزين"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "تغيير اسم الحساب"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "اعداد كلمة مرور جديدة"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index d760e3d0e438ca49287a54adc10f014c6c5d0cef..c18c2b146fe341b84a48f449e0d61ae74bebde01 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 5f2b7f50b2eb2cef51c1576a571ade74f3ac4140..7e415d6b9d2af8b07715f96f7a4004570d96565f 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,15 +186,15 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -182,7 +202,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -190,15 +210,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -206,11 +226,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -218,15 +238,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -234,22 +254,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -259,7 +283,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -279,7 +303,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -335,67 +359,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -410,7 +434,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -479,7 +503,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -608,7 +632,7 @@ msgstr "Завяршыць ўстаноўку."
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 965d701fc2e4296d1d306949d98f0a38a1ad0905..cba5a16eb98b2a7425bd8db27f0f84de20523a7d 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -276,7 +288,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -284,15 +296,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -300,11 +312,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -312,11 +324,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 8bb3a339cac2a77d77419e76a5ed17417f0034ca..914222534717493714c135d6a371930fc005692a 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index b95f90370d704bb1246aff443615483908e9bdd3..fa51807332dfcd15f63013f4f0a7485b3b7bdb58 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Няма избрани категории за изтриване"
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Неделя"
@@ -166,59 +186,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "днес"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "последният месец"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "последната година"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "последните години"
@@ -226,22 +246,26 @@ msgstr "последните години"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Добре"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "Споделяне"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "създаване"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "Лични"
msgid "Users"
msgstr "Потребители"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Приложения"
@@ -600,7 +624,7 @@ msgstr "Завършване на настройките"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Изход"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 3d91bd55b820b5e8b72ee1e6323a79e60a018f45..69c221b386c95420f585a48e91b3516596450874 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index ee8f206c9c251d24125c47f84fa06789f1c11b94..20f297f9cdcd1c3defeca0fa9d59b83b995202c4 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s сподели папката %s с Вас"
msgid "%s shared the file %s with you"
msgstr "%s сподели файла %s с Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Изтегляне"
@@ -75,6 +75,6 @@ msgstr "Качване"
msgid "Cancel upload"
msgstr "Спри качването"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Няма наличен преглед за"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 234bc905f5a0911155bb1b25cb9c5e64e3f34b81..6ee938f5ab948f89812cebb1d341777bac7efa43 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Потребители"
msgid "Admin"
msgstr "Админ"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "уеб услуги под Ваш контрол"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Вашият web сървър все още не е удачно нас
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "преди секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "днес"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "последният месец"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "последната година"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "последните години"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c26480360dc4c546544866e2835fdbea2830362c..f83f6218c72d6a2d8cd81e3d94e6bca293745cf4 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Обновяване до {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Изключено"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Включено"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Моля почакайте...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Обновява се..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Обновяване"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Записване..."
@@ -148,16 +152,16 @@ msgstr "възтановяване"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Групи"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Изтриване"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Още"
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "Покажи настройките за първоначално зар
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Парола"
@@ -438,7 +442,7 @@ msgstr "Нова парола"
msgid "Change password"
msgstr "Промяна на паролата"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Екранно име"
@@ -454,38 +458,66 @@ msgstr "Вашия email адрес"
msgid "Fill in an email address to enable password recovery"
msgstr "Въведете е-поща за възстановяване на паролата"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Език"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помогнете с превода"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Криптиране"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Хранилище по подразбиране"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Други"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Потребител"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 00d80cb160ec770bb413741f03c3b4f0d7c3a05c..8401703d7c0c36cd2c36517e3538c37994f6928b 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 9be574c0eb762fb6f20ea3dae7fa5db655d69daa..d42a8ce0459c1921d246c88c3ca763cc7ab6bdd1 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "মুছে ফেলার জন্য কনো ক্যাটে
msgid "Error removing %s from favorites."
msgstr "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "রবিবার"
@@ -166,59 +186,59 @@ msgstr "নভেম্বর"
msgid "December"
msgstr "ডিসেম্বর"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "আজ"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "মাস পূর্বে"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -226,22 +246,26 @@ msgstr "বছর পূর্বে"
msgid "Choose"
msgstr "বেছে নিন"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "তথাস্তু"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr "অবজেক্টের ধরণটি সুনির্দিষ
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "সমস্যা"
@@ -271,7 +295,7 @@ msgstr "ভাগাভাগিকৃত"
msgid "Share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে "
@@ -327,67 +351,67 @@ msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ
msgid "Expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "পাঠানো হচ্ছে......"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "ব্যক্তিগত"
msgid "Users"
msgstr "ব্যবহারকারী"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "অ্যাপ"
@@ -600,7 +624,7 @@ msgstr "সেটআপ সুসম্পন্ন কর"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "প্রস্থান"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index de8d7478780f0bad0ba270101eb01e4faaa9c7ae..e2785070c36f7936d2a285f359ef0cb9b3e3cdd6 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "সমস্যা"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr "পূনঃনামকরণ"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "মুলতুবি"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} টি বিদ্যমান"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "প্রতিস্থাপন"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "নাম সুপারিশ করুন"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "বাতিল"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "ক্রিয়া প্রত্যাহার"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "রাম"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "আকার"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "পরিবর্তিত"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "ডাউনলোড"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "মুছে"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "আপলোডের আকারটি অনেক বড়"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "বর্তমান স্ক্যানিং"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 13ff8fcdf45d62a8e4fb1e41ac6a43e22b429437..f44908ae2c1f765b567f245e736ef1e7e6d7bf65 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগ
msgid "%s shared the file %s with you"
msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ডাউনলোড"
@@ -75,6 +75,6 @@ msgstr "আপলোড"
msgid "Cancel upload"
msgstr "আপলোড বাতিল কর"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 358cea2fd495803a2b408a07eac4ecceea186135..40a6b3b7470763ace4e87cd02ff3e1e55b2f83a7 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ব্যবহারকারী"
msgid "Admin"
msgstr "প্রশাসন"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "আজ"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "গতকাল"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "গত মাস"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "গত বছর"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "বছর পূর্বে"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 1f3fa4e093e50a0e79830c21af1d799d16e5e403..dc3e3ab4aec6e4781c3b5927cf7e6e80ddfc0984 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "নিষ্ক্রিয়"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "সক্রিয় "
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "সমস্যা"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "পরিবর্ধন"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
@@ -148,16 +152,16 @@ msgstr "ক্রিয়া প্রত্যাহার"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "গোষ্ঠীসমূহ"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "গোষ্ঠী প্রশাসক"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "মুছে"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "বেশী"
msgid "Less"
msgstr "কম"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "ভার্সন"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "প্রথমবার চালানোর যাদুকর পূ
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "আপনি ব্যবহার করছেন <strong>%s</strong>, সুলভ <strong>%s</strong> এর মধ্যে।"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "কূটশব্দ"
@@ -438,7 +442,7 @@ msgstr "নতুন কূটশব্দ"
msgid "Change password"
msgstr "কূটশব্দ পরিবর্তন করুন"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "আপনার ই-মেইল ঠিকানা"
msgid "Fill in an email address to enable password recovery"
msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "ভাষা"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "অনুবাদ করতে সহায়তা করুন"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "অসীম"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "অন্যান্য"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ব্যবহারকারী"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "সংরক্ষণাগার"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 3a816ab1ca742b4780500ec9ab5f300a1f8bd66e..8448b210a449bc46f99c7071220f2acb82f7ed7a 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index cb3399fb366695fc0961df6644e47c93adac9655..b8e1e43613ab765de571b895ca1231a2facebb5e 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,63 +186,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -230,22 +250,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -275,7 +299,7 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -331,67 +355,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -406,7 +430,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -604,7 +628,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 88246efdb6b80f6ff64a61bff053e76f0b4e773c..721908ee79ab78dcdb042c691eac63ebb87ae840 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 47c09790f2ea29211b54b9e032ac49919d3ac6f1..b77acd17b7fc195d257338d7a4f8b1b93b7b3f16 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Spašavam..."
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 6585814d7490fc6a20c21cbfc38d4e3380aa9d29..900c6cb8f00387e7c56a12a98954ce134b07b8df 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -30,28 +30,28 @@ msgstr "grup"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activat el mode de manteniment"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desactivat el mode de manteniment"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Actualitzada la base de dades"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualitzant la memòria de cau del fitxers, això pot trigar molt..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Actualitzada la memòria de cau dels fitxers"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% fet ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +92,26 @@ msgstr "No hi ha categories per eliminar."
msgid "Error removing %s from favorites."
msgstr "Error en eliminar %s dels preferits."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Diumenge"
@@ -168,59 +188,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Desembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "avui"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fa %n dies"
msgstr[1] "fa %n dies"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "anys enrere"
@@ -228,22 +248,26 @@ msgstr "anys enrere"
msgid "Choose"
msgstr "Escull"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error en carregar la plantilla del seleccionador de fitxers"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "D'acord"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "No s'ha especificat el tipus d'objecte."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -273,7 +297,7 @@ msgstr "Compartit"
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error en compartir"
@@ -329,67 +353,67 @@ msgstr "Estableix la data de venciment"
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crea"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualitza"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimina"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "comparteix"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
@@ -404,7 +428,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "restableix la contrasenya %s"
@@ -473,7 +497,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuaris"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicacions"
@@ -602,7 +626,7 @@ msgstr "Acaba la configuració"
msgid "%s is available. Get more information on how to update."
msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Surt"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index ecc26a9b13266a0447e07a636ce919302bd33084..ca6a5240892c10680eab318bbbc6aa0c5609ac64 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +171,7 @@ msgstr[1] "%n fitxers"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} i {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 04c76283088d137af98ed628f99b0e70238ee74f..4e4d3419baef02bba17aa3748733380cb162667b 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s ha compartit la carpeta %s amb vós"
msgid "%s shared the file %s with you"
msgstr "%s ha compartit el fitxer %s amb vós"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Baixa"
@@ -76,6 +76,6 @@ msgstr "Puja"
msgid "Cancel upload"
msgstr "Cancel·la la pujada"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No hi ha vista prèvia disponible per a"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 6e9651339a2fa1f4b3908eceab6bb84fdc8881bd..641242729f71c9352ab7dd2944d89d6cf3b678d8 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:40+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,11 +49,23 @@ msgstr "Usuaris"
msgid "Admin"
msgstr "Administració"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ha fallat l'actualització \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
@@ -106,37 +118,37 @@ msgstr "Els fitxers del tipus %s no són compatibles"
msgid "Failed to open archive when installing app"
msgstr "Ha fallat l'obertura del fitxer en instal·lar l'aplicació"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "L'aplicació no proporciona un fitxer info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "La carpeta de l'aplicació ja existeix"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s"
@@ -265,51 +277,51 @@ msgstr "El servidor web no està configurat correctament per permetre la sincron
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segons enrere"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "avui"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ahir"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "fa %n dia"
msgstr[1] "fa %n dies"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "el mes passat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "l'any passat"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anys enrere"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 00860a8a12d11a7084842db099f09f3998ae0a3e..7f010b29f54acf69c9981a03f3f101cc536f672d 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:31+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -86,55 +86,59 @@ msgstr "No es pot eliminar l'usuari del grup %s"
msgid "Couldn't update app."
msgstr "No s'ha pogut actualitzar l'aplicació."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualitza a {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactiva"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Habilita"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Espereu..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Error en desactivar l'aplicació"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Error en activar l'aplicació"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualitzant..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error en actualitzar l'aplicació"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualitza"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Desant..."
@@ -150,16 +154,16 @@ msgstr "desfés"
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grups"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Esborra"
@@ -179,7 +183,7 @@ msgstr "Error en crear l'usuari"
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya vàlida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Català"
@@ -345,11 +349,11 @@ msgstr "Més"
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Torna a mostrar l'assistent de primera execució"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasenya"
@@ -440,7 +444,7 @@ msgstr "Contrasenya nova"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nom a mostrar"
@@ -456,38 +460,66 @@ msgstr "Correu electrònic"
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Xifrat"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers."
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Contrasenya d'accés"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Desencripta tots els fitxers"
@@ -513,30 +545,30 @@ msgstr "Escriviu la contrasenya de recuperació per a poder recuperar els fitxer
msgid "Default Storage"
msgstr "Emmagatzemament per defecte"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Il·limitat"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Un altre"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nom d'usuari"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Emmagatzemament"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "canvia el nom a mostrar"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "estableix nova contrasenya"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 102b8a3d7bbec67594c477b62d18f431c658e9db..902aea9b33ab007d3b9ff812738a376d490c80ea 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:31+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 3689101c5dfb3a5056cedfb42fd8088bd4c2601c..e16afa26bb1bc5c8b0e96d4f5cc4bb32dec2756b 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 08:00+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -95,6 +95,26 @@ msgstr "Žádné kategorie nebyly vybrány ke smazání."
msgid "Error removing %s from favorites."
msgstr "Chyba při odebírání %s z oblíbených."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Neděle"
@@ -171,63 +191,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Prosinec"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "před %n minutou"
msgstr[1] "před %n minutami"
msgstr[2] "před %n minutami"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "před %n hodinou"
msgstr[1] "před %n hodinami"
msgstr[2] "před %n hodinami"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "dnes"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "včera"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "minulý měsíc"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "před %n měsícem"
msgstr[1] "před %n měsíci"
msgstr[2] "před %n měsíci"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "před měsíci"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "před lety"
@@ -235,22 +255,26 @@ msgstr "před lety"
msgid "Choose"
msgstr "Vybrat"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Chyba při načítání šablony výběru souborů"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -260,7 +284,7 @@ msgstr "Není určen typ objektu."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Chyba"
@@ -280,7 +304,7 @@ msgstr "Sdílené"
msgid "Share"
msgstr "Sdílet"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Chyba při sdílení"
@@ -336,67 +360,67 @@ msgstr "Nastavit datum vypršení platnosti"
msgid "Expiration date"
msgstr "Datum vypršení platnosti"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Sdílet e-mailem:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Žádní lidé nenalezeni"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Sdílení již sdílené položky není povoleno"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Sdíleno v {item} s {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "vytvořit"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "smazat"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "sdílet"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňování data vypršení platnosti"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Chyba při nastavení data vypršení platnosti"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Odesílám ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail odeslán"
@@ -411,7 +435,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "reset hesla %s"
@@ -480,7 +504,7 @@ msgstr "Osobní"
msgid "Users"
msgstr "Uživatelé"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikace"
@@ -609,7 +633,7 @@ msgstr "Dokončit nastavení"
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odhlásit se"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 503fc964125a59d60abc091671fd9c4c756cee8f..92e790b87852b027163a0fbffc99bfbb5be13d29 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 08:10+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 58fe5480946a1c5be54f8106f19afc527d5cd806..5b180f5c5591a25230b085eb39fcfe33273c5209 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s s Vámi sdílí složku %s"
msgid "%s shared the file %s with you"
msgstr "%s s Vámi sdílí soubor %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Stáhnout"
@@ -76,6 +76,6 @@ msgstr "Odeslat"
msgid "Cancel upload"
msgstr "Zrušit odesílání"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Náhled není dostupný pro"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 71b739cfa3bdf70a17b9b52216babfa725cd8475..183bc420e8006874254a758089dc925e03bf4a08 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-30 07:31+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -51,11 +51,23 @@ msgstr "Uživatelé"
msgid "Admin"
msgstr "Administrace"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Selhala aktualizace verze \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webové služby pod Vaší kontrolou"
@@ -108,37 +120,37 @@ msgstr "Archivy typu %s nejsou podporovány"
msgid "Failed to open archive when installing app"
msgstr "Chyba při otevírání archivu během instalace aplikace"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Aplikace neposkytuje soubor info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Adresář aplikace již existuje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s"
@@ -267,55 +279,55 @@ msgstr "Váš webový server není správně nastaven pro umožnění synchroniz
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "před pár sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "před %n minutou"
msgstr[1] "před %n minutami"
msgstr[2] "před %n minutami"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "před %n hodinou"
msgstr[1] "před %n hodinami"
msgstr[2] "před %n hodinami"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dnes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "minulý měsíc"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "před %n měsícem"
msgstr[1] "před %n měsíci"
msgstr[2] "před %n měsíci"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d3f48fd240dbcbcc7291aa7a9afd4154c130c37d..3d030548d8b65024459b15327109fa0c2944d996 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-28 16:41+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -132,11 +132,15 @@ msgstr "Aktualizovat"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
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:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Ukládám..."
@@ -152,16 +156,16 @@ msgstr "vrátit zpět"
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Smazat"
@@ -181,7 +185,7 @@ msgstr "Chyba při vytváření užiatele"
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Česky"
@@ -347,11 +351,11 @@ msgstr "Více"
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "Znovu zobrazit průvodce prvním spuštěním"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Heslo"
@@ -442,7 +446,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Zobrazované jméno"
@@ -458,38 +462,66 @@ msgstr "Vaše e-mailová adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolení obnovy hesla vyplňte e-mailovou adresu"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrování"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Přihlašovací heslo"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Odšifrovat všechny soubory"
@@ -515,30 +547,30 @@ msgstr "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesl
msgid "Default Storage"
msgstr "Výchozí úložiště"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neomezeně"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Jiný"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uživatelské jméno"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Úložiště"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "změnit zobrazované jméno"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastavit nové heslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 6617ad24829dd21fc98903b916c1bf5326df56e6..69340de29b3fe05e745dec5e5ae35386c11ef57b 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-28 16:52+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 700bfe97729cb3187cbbc2de5307d7295a0463c4..fbafa1ed11d3c25e7acf617243f1f578bd6969d2 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Ni ddewiswyd categorïau i'w dileu."
msgid "Error removing %s from favorites."
msgstr "Gwall wrth dynnu %s o ffefrynnau."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sul"
@@ -167,15 +187,15 @@ msgstr "Tachwedd"
msgid "December"
msgstr "Rhagfyr"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -183,7 +203,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -191,15 +211,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "heddiw"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -207,11 +227,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -219,15 +239,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -235,22 +255,26 @@ msgstr "blwyddyn yn ôl"
msgid "Choose"
msgstr "Dewisiwch"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Iawn"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -260,7 +284,7 @@ msgstr "Nid yw'r math o wrthrych wedi cael ei nodi."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Gwall"
@@ -280,7 +304,7 @@ msgstr "Rhannwyd"
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
@@ -336,67 +360,67 @@ msgstr "Gosod dyddiad dod i ben"
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creu"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "diweddaru"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "dileu"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "rhannu"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
@@ -411,7 +435,7 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -480,7 +504,7 @@ msgstr "Personol"
msgid "Users"
msgstr "Defnyddwyr"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Pecynnau"
@@ -609,7 +633,7 @@ msgstr "Gorffen sefydlu"
msgid "%s is available. Get more information on how to update."
msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Allgofnodi"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 7507b666b09c9bfb4b965e3b17bc45f0d27a6994..aa6678894309872a0abae1e696ca684bce1f799e 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 40a26ec13c0a60a8286a32f2c624b91a37c753a3..11970a0b13941268f31f7e758376aed9b9fd6b5d 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "Rhannodd %s blygell %s â chi"
msgid "%s shared the file %s with you"
msgstr "Rhannodd %s ffeil %s â chi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Llwytho i lawr"
@@ -75,6 +75,6 @@ msgstr "Llwytho i fyny"
msgid "Cancel upload"
msgstr "Diddymu llwytho i fyny"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Does dim rhagolwg ar gael ar gyfer"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 0ccf38477371f8957d9beb714086fc443b8a4989..63e302b3190324dbdb73bf08ee076310687af45c 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Defnyddwyr"
msgid "Admin"
msgstr "Gweinyddu"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "gwasanaethau gwe a reolir gennych"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau o
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -276,7 +288,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -284,15 +296,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "heddiw"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ddoe"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -300,11 +312,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mis diwethaf"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -312,11 +324,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "y llynedd"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "blwyddyn yn ôl"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index e74e9a473f8c38fad7a2abb279cceaefa67160a8..98cd0448cb053e2d3d34817325c8bcc85e6221e7 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Gwall"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Yn cadw..."
@@ -148,16 +152,16 @@ msgstr "dadwneud"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Dileu"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Cyfrinair"
@@ -438,7 +442,7 @@ msgstr "Cyfrinair newydd"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Amgryptiad"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Arall"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Enw defnyddiwr"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index a42f865fb36a020f7602edb954ba35838cc05202..3756eac182a21c1925d4faf31087407326076903 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index adc2e0f26ca91d8790bafcc306383179d74ad22d..534ae03e955c5ce2b7851b53c542e016ca3e9149 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -94,6 +94,26 @@ msgstr "Ingen kategorier valgt"
msgid "Error removing %s from favorites."
msgstr "Fejl ved fjernelse af %s fra favoritter."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Søndag"
@@ -170,59 +190,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "sidste år"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "år siden"
@@ -230,22 +250,26 @@ msgstr "år siden"
msgid "Choose"
msgstr "Vælg"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fejl ved indlæsning af filvælger skabelon"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr "Objekttypen er ikke angivet."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fejl"
@@ -275,7 +299,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fejl under deling"
@@ -331,67 +355,67 @@ msgstr "Vælg udløbsdato"
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "opret"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "opdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slet"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail afsendt"
@@ -406,7 +430,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s adgangskode nulstillet"
@@ -475,7 +499,7 @@ msgstr "Personligt"
msgid "Users"
msgstr "Brugere"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -604,7 +628,7 @@ msgstr "Afslut opsætning"
msgid "%s is available. Get more information on how to update."
msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Log ud"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index fb180ee25be6bac6320d5a8ad0151d5ed3afa0de..81e48316becba6488811ab53d99c8a286458a754 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 17:27+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index a6dc9237e089627d7b93ee18b7860a6515b58de3..d5bee700f160998ac0887c9058a1f6253215038c 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med dig"
msgid "%s shared the file %s with you"
msgstr "%s delte filen %s med dig"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Forhåndsvisning ikke tilgængelig for"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index d6c79b185e9265a0754298265f99364594fd5572..0bacfcf5e8adfe6fc3e048ebae6b4acaf88b378c 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 05:10+0000\n"
-"Last-Translator: claus_chr <claus_chr@webspeed.dk>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,23 @@ msgstr "Brugere"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgradering af \"%s\" fejlede"
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
@@ -108,37 +120,37 @@ msgstr "Arkiver af type %s understøttes ikke"
msgid "Failed to open archive when installing app"
msgstr "Kunne ikke åbne arkiv under installation af appen"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Der følger ingen info.xml-fil med appen"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Appen kan ikke installeres, da den indeholder ikke-tilladt kode"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "App-mappe findes allerede"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Kan ikke oprette app-mappe. Ret tilladelser. %s"
@@ -267,51 +279,51 @@ msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering for
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder siden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "sidste måned"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "sidste år"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 5119c9950a22a2f0e070746a8e97ddef32f4e868..faa811aa785c6a40e9e98de53cdf4ae7f304e893 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 15:40+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -87,55 +87,59 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke opdatere app'en."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Opdatér til {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktiver"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktiver"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Vent venligst..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Kunne ikke deaktivere app"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Kunne ikke aktivere app"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Opdaterer...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Der opstod en fejl under app opgraderingen"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fejl"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Opdater"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Gemmer..."
@@ -151,16 +155,16 @@ msgstr "fortryd"
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slet"
@@ -180,7 +184,7 @@ msgstr "Fejl ved oprettelse af bruger"
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Dansk"
@@ -346,11 +350,11 @@ msgstr "Mere"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -417,7 +421,7 @@ msgstr "Vis Første Kørsels Guiden igen."
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kodeord"
@@ -441,7 +445,7 @@ msgstr "Nyt kodeord"
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Skærmnavn"
@@ -457,38 +461,66 @@ msgstr "Din emailadresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Krypterings app'en er ikke længere aktiv. Dekrypter alle dine filer. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Log-in kodeord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekrypter alle Filer "
@@ -514,30 +546,30 @@ msgstr "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ve
msgid "Default Storage"
msgstr "Standard opbevaring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrænset"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andet"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brugernavn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Opbevaring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "skift skærmnavn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "skift kodeord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 1d75484a1d35f00ea98f21aa1b4830079bd9b728..656890881c2551f5db1521ad41793ce25737339f 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-23 20:16-0400\n"
-"PO-Revision-Date: 2013-08-22 20:00+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 0a572015282d1f52db1d9aa245418d84b6e0206c..fa8b284b671e4c35d44825d1f0817679c4bae14e 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -98,6 +98,26 @@ msgstr "Es wurde keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonntag"
@@ -174,59 +194,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "Vor Jahren"
@@ -234,22 +254,26 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Dateiauswahltemplate konnte nicht geladen werden"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -259,7 +283,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -279,7 +303,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -335,67 +359,67 @@ msgstr "Setze ein Ablaufdatum"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Über eine E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
@@ -410,7 +434,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -479,7 +503,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -608,7 +632,7 @@ msgstr "Installation abschließen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 21a1d8cafb2160e0a3bc2be1e7217e06c8519ee8..3e0c024b6cb6d40d820c65deb61380da6934f04e 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 18:00+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 656a195b2f72247d17cc345081938417e9468878..ad1e84807eadd85a3bdfaba6db4ecc644bed0b83 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Dir geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Dir geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -77,6 +77,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 4b00901bf504707d0b958b8c826492b882ea0ee4..2a01484425cace872f0abffaf9ae6ea25df12abd 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 11:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Services unter Deiner Kontrolle"
@@ -109,37 +121,37 @@ msgstr "Archive vom Typ %s werden nicht unterstützt"
msgid "Failed to open archive when installing app"
msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Die Applikation enthält keine info,xml Datei"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Das Applikationsverzeichnis existiert bereits"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die Berechtigungen an. %s"
@@ -268,51 +280,51 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 30ff6133c05a3ea522913f23580666040dbb36ff..1a8503a37915b590d56bd6054e76206a3d215e5b 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 11:10+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -133,11 +133,15 @@ msgstr "Aktualisierung durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Speichern..."
@@ -153,16 +157,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -182,7 +186,7 @@ msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Deutsch (Persönlich)"
@@ -348,11 +352,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -419,7 +423,7 @@ msgstr "Erstinstallation erneut durchführen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -443,7 +447,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -459,38 +463,66 @@ msgstr "Deine E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hilf bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt."
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -516,30 +548,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 36a8e3174131463c5adfa6f924e64a99dd190c98..aa8ba6bb140b628d11ce1a8cda389b430f95b07b 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 12:50+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 7f813bb30cf87da86dd13709fcb119b5d961d85b..6812c21bb5aa6b752e8938de784bcd54ab363b8f 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -167,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -227,22 +247,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -272,7 +296,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -328,67 +352,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -403,7 +427,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -601,7 +625,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 7666303833e80ccb4cecd04073f454c4db4946a9..7f3e0eafd0461c44d16d441b3a610390ef38c87c 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 11e3ea1c60bdd35f394140bcd4d3b2742afac39c..d75c8166a6e20f10491c0299bdef2c6d70132487 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 9469c9538418239c3518abff8127d878c859349d..827bc1f7a699c1071afee8d067b724b8afdcf99f 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -99,6 +99,26 @@ msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonntag"
@@ -175,59 +195,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "Vor Jahren"
@@ -235,22 +255,26 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -260,7 +284,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -280,7 +304,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -336,67 +360,67 @@ msgstr "Ein Ablaufdatum setzen"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email gesendet"
@@ -411,7 +435,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -480,7 +504,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -609,7 +633,7 @@ msgstr "Installation abschliessen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 95d27fc4a67332468a3a5267657bb32732008ae8..bd65b087c356c38600a2e4e7c915517b4509a3ba 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 95b2c5d60fca6420185610df978f727a390c7401..8616c16eb645c54d4bac9be4fce641bf96b2d2b6 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -66,7 +66,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Ihnen geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Herunterladen"
@@ -78,6 +78,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 11d2f26f5a497f193b48659156954ce7c5fa618b..ff7512d924018515c8a78becd42b3c613ba536ee 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
@@ -109,37 +121,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Anwendungsverzeichnis existiert bereits"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -268,51 +280,51 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 5e184ab89b919653e459cda0417b8abcc5a512e3..0e4f92b5e6a030cc446e8fe3fa6c13ce9393437e 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -92,55 +92,59 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Update zu {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivieren"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivieren"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Bitte warten...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Fehler während der Deaktivierung der Anwendung"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Fehler während der Aktivierung der Anwendung"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Update..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Es ist ein Fehler während des Updates aufgetreten"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Update durchführen"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Speichern..."
@@ -156,16 +160,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -185,7 +189,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -351,11 +355,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -422,7 +426,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -446,7 +450,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -462,38 +466,66 @@ msgstr "Ihre E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -519,30 +551,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 0267d804b6fe8c6d1c5ec8b2b726db3827ce9dd9..04763d8c636bded0e66be510ca4637c08621f27c 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 000f19fdda54a96a78fe30d841ef12f136c95d2d..f1d1a4a9c64db174671a9c58137482d8083b7a37 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -98,6 +98,26 @@ msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonntag"
@@ -174,59 +194,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "Vor Jahren"
@@ -234,22 +254,26 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -259,7 +283,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -279,7 +303,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -335,67 +359,67 @@ msgstr "Ein Ablaufdatum setzen"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email gesendet"
@@ -410,7 +434,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -479,7 +503,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -608,7 +632,7 @@ msgstr "Installation abschließen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index cf3e5f3eb62085ce0a606a4cfd0ddf6ece89c79e..e236b674b776d55bcfebce52417e3814fd758c3b 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 18:00+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 51ed893dda77f62e4b070f866ff166dc6e8c7078..efed1ad727abc30ef95b3a79a74f661965b1083c 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Ihnen geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Herunterladen"
@@ -77,6 +77,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 2abd875bdd9de5e944b5825786bc4a9fb8797dbf..76d7fef1489aa328d352bc13cdfed7940009b43d 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 11:30+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
@@ -108,37 +120,37 @@ msgstr "Archive des Typs %s werden nicht unterstützt."
msgid "Failed to open archive when installing app"
msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Die Applikation enthält keine info,xml Datei"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Der Ordner für die Anwendung existiert bereits."
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s"
@@ -267,51 +279,51 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index a2f41d584fac6131a62d289c2574950e65f72227..bd55435a00eb3deeb56329eed99e93f4fb424b2b 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 11:10+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -135,11 +135,15 @@ msgstr "Update durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Speichern..."
@@ -155,16 +159,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -184,7 +188,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -350,11 +354,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -421,7 +425,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -445,7 +449,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -461,38 +465,66 @@ msgstr "Ihre E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -518,30 +550,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index aa03bac5ff2fd819736fe5769cd7024112bdbad5..09f58790782a203fe77bc5501e82fe882d22efa6 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 07:00+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index ca0b80f304b9659ea1107d983bd2beb8429d4d1e..f9d610d2032931b66bf9f63058424e6ef1bfa399 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -97,6 +97,26 @@ msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφ
msgid "Error removing %s from favorites."
msgstr "Σφάλμα αφαίρεσης %s από τα αγαπημένα."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Κυριακή"
@@ -173,59 +193,59 @@ msgstr "Νοέμβριος"
msgid "December"
msgstr "Δεκέμβριος"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "σήμερα"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "χρόνια πριν"
@@ -233,22 +253,26 @@ msgstr "χρόνια πριν"
msgid "Choose"
msgstr "Επιλέξτε"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Οκ"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -258,7 +282,7 @@ msgstr "Δεν καθορίστηκε ο τύπος του αντικειμέν
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Σφάλμα"
@@ -278,7 +302,7 @@ msgstr "Κοινόχρηστα"
msgid "Share"
msgstr "Διαμοιρασμός"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
@@ -334,67 +358,67 @@ msgstr "Ορισμός ημ. λήξης"
msgid "Expiration date"
msgstr "Ημερομηνία λήξης"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Διαμοιρασμός μέσω email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Δεν βρέθηκε άνθρωπος"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Διαμοιρασμός του {item} με τον {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Σταμάτημα διαμοιρασμού"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Το Email απεστάλη "
@@ -409,7 +433,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -478,7 +502,7 @@ msgstr "Προσωπικά"
msgid "Users"
msgstr "Χρήστες"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Εφαρμογές"
@@ -607,7 +631,7 @@ msgstr "Ολοκλήρωση εγκατάστασης"
msgid "%s is available. Get more information on how to update."
msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Αποσύνδεση"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index bd017bcd8e713c924cfe2930e2ff46e6fd55ae82..24da73a436f028212d64dc675aa50d6199f8a03b 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 79341a4119386f9e457e3db7dda9dd574acea01c..7185b97f8542ceb6aad14ab2682e3293494bb011 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας"
msgid "%s shared the file %s with you"
msgstr "%s μοιράστηκε το αρχείο %s μαζί σας"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Λήψη"
@@ -76,6 +76,6 @@ msgstr "Μεταφόρτωση"
msgid "Cancel upload"
msgstr "Ακύρωση αποστολής"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 5ef86707792afaaeda3ece1451a3e9c7191896cf..e26684eae7f872e552140a81709ea9b08c38a449 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Χρήστες"
msgid "Admin"
msgstr "Διαχειριστής"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Αποτυχία αναβάθμισης του \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κα
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "σήμερα"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "χτες"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "τελευταίο μήνα"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index c8580902be2c220bce9ccd79c68dc0f407a161b1..20c03f9adc2197a869acbbbc7b45032530c3056e 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -90,55 +90,59 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ
msgid "Couldn't update app."
msgstr "Αδυναμία ενημέρωσης εφαρμογής"
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Ενημέρωση σε {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Απενεργοποίηση"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Ενεργοποίηση"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Παρακαλώ περιμένετε..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Ενημέρωση..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Σφάλμα"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ενημέρωση"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Ενημερώθηκε"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
@@ -154,16 +158,16 @@ msgstr "αναίρεση"
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίρεση χρήστη"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Ομάδα Διαχειριστών"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Διαγραφή"
@@ -183,7 +187,7 @@ msgstr "Σφάλμα δημιουργίας χρήστη"
msgid "A valid password must be provided"
msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__όνομα_γλώσσας__"
@@ -349,11 +353,11 @@ msgstr "Περισσότερα"
msgid "Less"
msgstr "Λιγότερα"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -420,7 +424,7 @@ msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Συνθηματικό"
@@ -444,7 +448,7 @@ msgstr "Νέο συνθηματικό"
msgid "Change password"
msgstr "Αλλαγή συνθηματικού"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Όνομα εμφάνισης"
@@ -460,38 +464,66 @@ msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου
msgid "Fill in an email address to enable password recovery"
msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Γλώσσα"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφραση"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Κρυπτογράφηση"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -517,30 +549,30 @@ msgstr "Εισάγετε το συνθηματικό ανάκτησης ώστε
msgid "Default Storage"
msgstr "Προκαθορισμένη Αποθήκευση "
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Απεριόριστο"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Άλλο"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Όνομα χρήστη"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Αποθήκευση"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "αλλαγή ονόματος εμφάνισης"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "επιλογή νέου κωδικού"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index f01616c71f53bde8d14664033c8aa3e4b79cebcf..ac03107faae4a3c3fc8bacc3366299cc771cea22 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 8bc849cef431f913391c0b40736fdac0c01fb2d0..14e0eb573caf67d9f585ba23923cef4334e033d3 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -167,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -227,22 +247,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -272,7 +296,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -328,67 +352,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -403,7 +427,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -601,7 +625,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 35c76d3b04b57d57e3a02198a0dae15bbf64024a..4663eb69623970ef2a1c08a6cf50704fab201adb 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s shared the folder %s with you"
msgid "%s shared the file %s with you"
msgstr "%s shared the file %s with you"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No preview available for"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 6cc0184b836f221c27d999d65f257beabb87b6b9..53ee952f6168d5de2c2bd7bc261c424a1dd811bf 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web services under your control"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 95bb346d1a15adeaa93461a4d9e6aeecb2be42b7..b03ef2fbfbcc1c8e6735bff96ee22e1540b97fe7 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passcode"
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 9c7f4649db75f997dd3e0cf28d1b31ed3aaf9a26..22391f10ba9c2d78534d6df9205a818211b69c09 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 95570ce896f12c99911dcb62823e8d8abedf59f7..c58c6317903aa456084fb6bdd3e8d8930ab3c446 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:40+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -91,6 +91,26 @@ msgstr "No categories selected for deletion."
msgid "Error removing %s from favorites."
msgstr "Error removing %s from favourites."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sunday"
@@ -167,59 +187,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Settings"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "today"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "last month"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "months ago"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "last year"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "years ago"
@@ -227,22 +247,26 @@ msgstr "years ago"
msgid "Choose"
msgstr "Choose"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr "The object type is not specified."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -272,7 +296,7 @@ msgstr "Shared"
msgid "Share"
msgstr "Share"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error whilst sharing"
@@ -328,67 +352,67 @@ msgstr "Set expiration date"
msgid "Expiration date"
msgstr "Expiration date"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Share via email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No people found"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Resharing is not allowed"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Shared in {item} with {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Unshare"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "can edit"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "access control"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "create"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "update"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "delete"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "share"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email sent"
@@ -403,7 +427,7 @@ msgstr "The update was unsuccessful. Please report this issue to the <a href=\"h
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "The update was successful. Redirecting you to ownCloud now."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s password reset"
@@ -472,7 +496,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Users"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -601,7 +625,7 @@ msgstr "Finish setup"
msgid "%s is available. Get more information on how to update."
msgstr "%s is available. Get more information on how to update."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Log out"
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index f7d558ebe2a06352067452d570b0487005eef633..ee07f5bbe41a0b1834a2f3ee9a021d6518711850 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:40+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 93495b536e6408cd8ada53a0cb77b7b25ad78e1e..99cac4331f6fc1e5be673e84ad1a06c55e6881ab 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 17:00+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s shared the folder %s with you"
msgid "%s shared the file %s with you"
msgstr "%s shared the file %s with you"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Cancel upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No preview available for"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 413e7ae427d53ebe83359e8ff37e4dffa9a13c06..6f6346036727b008ad4ea28ee7a630ce41574efb 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 16:50+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -49,11 +49,23 @@ msgstr "Users"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Failed to upgrade \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web services under your control"
@@ -106,37 +118,37 @@ msgstr "Archives of type %s are not supported"
msgid "Failed to open archive when installing app"
msgstr "Failed to open archive when installing app"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "App does not provide an info.xml file"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "App can't be installed because of unallowed code in the App"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "App can't be installed because it is not compatible with this version of ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "App directory already exists"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Can't create app folder. Please fix permissions. %s"
@@ -265,51 +277,51 @@ 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>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "seconds ago"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minutes ago"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n hours ago"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "today"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "yesterday"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n days ago"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "last month"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n months ago"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "last year"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "years ago"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index ece8bf22f34aed28aa448e0fd8be21170badcd26..7187857ac83379f7b594019f874dd33f0c30e138 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 16:50+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -129,11 +129,15 @@ msgstr "Update"
msgid "Updated"
msgstr "Updated"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decrypting files... Please wait, this can take some time."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Saving..."
@@ -149,16 +153,16 @@ msgstr "undo"
msgid "Unable to remove user"
msgstr "Unable to remove user"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Groups"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Group Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Delete"
@@ -178,7 +182,7 @@ msgstr "Error creating user"
msgid "A valid password must be provided"
msgstr "A valid password must be provided"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +348,11 @@ msgstr "More"
msgid "Less"
msgstr "Less"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "Show First Run Wizard again"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Password"
@@ -439,7 +443,7 @@ msgstr "New password"
msgid "Change password"
msgstr "Change password"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Display Name"
@@ -455,38 +459,66 @@ msgstr "Your email address"
msgid "Fill in an email address to enable password recovery"
msgstr "Fill in an email address to enable password recovery"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Language"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Help translate"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Encryption"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "The encryption app is no longer enabled, decrypt all your files"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Log-in password"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decrypt all Files"
@@ -512,30 +544,30 @@ msgstr "Enter the recovery password in order to recover the user's files during
msgid "Default Storage"
msgstr "Default Storage"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unlimited"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Other"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Username"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Storage"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "change display name"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "set new password"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Default"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index 8ea95e2d3bd4176b99e0b45df4b816ab03dc11e6..419452929a171c42e58233090353613ba839436e 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 17:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index dd1d6ebc5e2649d35c65f86ee8ab96db0d69a331..b3f65dc4fbc9dff90b98ad0ae30d2ed4635fa050 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Neniu kategorio elektiĝis por forigo."
msgid "Error removing %s from favorites."
msgstr "Eraro dum forigo de %s el favoratoj."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "dimanĉo"
@@ -168,59 +188,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Decembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "monatoj antaŭe"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "lastajare"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -228,22 +248,26 @@ msgstr "jaroj antaŭe"
msgid "Choose"
msgstr "Elekti"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Akcepti"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "Ne indikiĝis tipo de la objekto."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Eraro"
@@ -273,7 +297,7 @@ msgstr "Dividita"
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
@@ -329,67 +353,67 @@ msgstr "Agordi limdaton"
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Kunhavigi per retpoŝto:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ne troviĝis gento"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "krei"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "forigi"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "La retpoŝtaĵo sendiĝis"
@@ -404,7 +428,7 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -473,7 +497,7 @@ msgstr "Persona"
msgid "Users"
msgstr "Uzantoj"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikaĵoj"
@@ -602,7 +626,7 @@ msgstr "Fini la instalon"
msgid "%s is available. Get more information on how to update."
msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Elsaluti"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 3db69832bef00e298fb3130e178c73cc3a76ab54..7458946888271220f221d02a35d12fc5d2b75267 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 215f134b838028cb60ff8b8aa21cb382c820165c..cc9cb10772a832d3345f784047e1be90fb5aa07e 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s kunhavigis la dosierujon %s kun vi"
msgid "%s shared the file %s with you"
msgstr "%s kunhavigis la dosieron %s kun vi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Elŝuti"
@@ -75,6 +75,6 @@ msgstr "Alŝuti"
msgid "Cancel upload"
msgstr "Nuligi alŝuton"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ne haveblas antaŭvido por"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 4f336569e993cf129e2f919d8d5770b96ed4a319..355fcf739840dea8af368efa5fabebfa7f731254 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Uzantoj"
msgid "Admin"
msgstr "Administranto"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "TTT-servoj regataj de vi"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dos
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hodiaŭ"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "hieraŭ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "lastamonate"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "lastajare"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "jaroj antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index e45c1e0d27b9a96b7939aa25948d84cb5ceec570..405b43ad00d68ba9e86582aba90731fb9ea6cd37 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Malkapabligi"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Kapabligi"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Eraro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ĝisdatigi"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Konservante..."
@@ -148,16 +152,16 @@ msgstr "malfari"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Forigi"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Esperanto"
@@ -343,11 +347,11 @@ msgstr "Pli"
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Pasvorto"
@@ -438,7 +442,7 @@ msgstr "Nova pasvorto"
msgid "Change password"
msgstr "Ŝanĝi la pasvorton"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Via retpoŝta adreso"
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Lingvo"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Defaŭlta konservejo"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Senlima"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Alia"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uzantonomo"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Konservejo"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Defaŭlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 40492891983125ecacd5d325241b976232b56b04..ea6f21e2c8888bf7961c2482bc790eccdc85a219 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 4a006b413d6693e2bf515381b4cda257bebe284c..8b73e83c2053392605ab39eb10940756698451d7 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -8,6 +8,7 @@
# I Robot <owncloud-bot@tmit.eu>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
# saskarip <saskarip@gmail.com>, 2013
# iGerli <stefano@aerosoles.net>, 2013
@@ -16,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +30,7 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr "%s compatido »%s« contigo"
+msgstr "%s ha compatido »%s« contigo"
#: ajax/share.php:227
msgid "group"
@@ -37,28 +38,28 @@ msgstr "grupo"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modo mantenimiento activado"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modo mantenimiento desactivado"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de datos actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Caché de archivos actualizada"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% hecho ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -99,6 +100,26 @@ msgstr "No hay categorías seleccionadas para borrar."
msgid "Error removing %s from favorites."
msgstr "Error eliminando %s de los favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -175,82 +196,86 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
-msgstr "hace segundos"
+msgstr "segundos antes"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hoy"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
-msgstr "hace meses"
+msgstr "meses antes"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
-msgstr "hace años"
+msgstr "años antes"
#: js/oc-dialogs.js:123
msgid "Choose"
msgstr "Seleccionar"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error cargando la plantilla del seleccionador de archivos"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -260,7 +285,7 @@ msgstr "El tipo de objeto no está especificado."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -270,7 +295,7 @@ msgstr "El nombre de la aplicación no está especificado."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr "¡El fichero requerido {file} no está instalado!"
+msgstr "¡El fichero {file} es necesario y no está instalado!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
@@ -280,17 +305,17 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
-msgstr "Error mientras comparte"
+msgstr "Error al compartir"
#: js/share.js:142
msgid "Error while unsharing"
-msgstr "Error mientras se deja de compartir"
+msgstr "Error al dejar de compartir"
#: js/share.js:149
msgid "Error while changing permissions"
-msgstr "Error mientras se cambia permisos"
+msgstr "Error al cambiar permisos"
#: js/share.js:158
msgid "Shared with you and the group {group} by {owner}"
@@ -336,67 +361,67 @@ msgstr "Establecer fecha de caducidad"
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eliminar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Correo electrónico enviado"
@@ -411,10 +436,10 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -480,7 +505,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicaciones"
@@ -494,7 +519,7 @@ msgstr "Ayuda"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr "Acceso prohibido"
+msgstr "Acceso denegado"
#: templates/404.php:15
msgid "Cloud not found"
@@ -509,7 +534,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!"
+msgstr "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -609,7 +634,7 @@ msgstr "Completar la instalación"
msgid "%s is available. Get more information on how to update."
msgstr "%s esta disponible. Obtener mas información de como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Salir"
@@ -621,7 +646,7 @@ msgstr "¡Inicio de sesión automático rechazado!"
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!"
+msgstr "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
@@ -648,7 +673,7 @@ msgstr "Inicios de sesión alternativos"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!"
+msgstr "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 150143b933d38ad90193b1a16a5323ae0b36a281..e68841cb875646b54c04c956c6d464b36aaddb56 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -7,14 +7,15 @@
# ggam <ggam@brainleakage.com>, 2013
# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
# qdneren <renanqd@yahoo.com.mx>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-13 23:50+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -164,23 +165,23 @@ msgstr "deshacer"
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n carpetas"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n archivos"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} y {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Subiendo %n archivo"
+msgstr[1] "Subiendo %n archivos"
#: js/filelist.js:628
msgid "files uploading"
@@ -212,7 +213,7 @@ msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
#: js/files.js:245
msgid ""
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 7d0a9ee023695c312f78d59098c55fd856492282..e32866e30113b8fb588bd628a6f7705771521b1c 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:20+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -68,20 +68,20 @@ msgid ""
"files."
msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
-msgstr ""
+msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 31ba6d42fae2491c4d20a7577ac7c04e160b25d9..26442ede404f6f510c24a04d2ce0a722917e6b31 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-13 23:50+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +33,7 @@ msgstr "Enviar"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr "Este enlace parece no funcionar más."
+msgstr "Vaya, este enlace parece que no volverá a funcionar."
#: templates/part.404.php:4
msgid "Reasons might be:"
@@ -65,7 +65,7 @@ msgstr "%s compartió la carpeta %s contigo"
msgid "%s shared the file %s with you"
msgstr "%s compartió el fichero %s contigo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -77,6 +77,6 @@ msgstr "Subir"
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No hay vista previa disponible para"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index beb34a8115ec05a6a26c126fb9b2abb01638064d..2f439a315fdb2a9fe58cdc0523c076812dbfce4d 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:16+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,43 +29,43 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "restaurar"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Error"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "eliminar archivo permanentemente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetas"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "recuperado"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 2c3194d68707062921fe825544b4522549527d8f..fa132a31fb73d53fdfa5f101b9288b03967af674 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 05:50+0000\n"
-"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:20+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,12 +34,12 @@ msgstr "No se ha podido revertir {archivo} a revisión {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr "Más..."
+msgstr "Más versiones..."
#: js/versions.js:116
msgid "No other versions available"
msgstr "No hay otras versiones disponibles"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Recuperar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 43f652d3a58ccdd3175d674dd7d7baa0b5031f73..319d9f9f13be6dd00912e7ea0f14cc68333d8924 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -5,14 +5,15 @@
# Translators:
# Dharth <emilpg@gmail.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 23:40+0000\n"
-"Last-Translator: Dharth <emilpg@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +52,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falló la actualización \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Servicios web bajo su control"
@@ -108,40 +121,40 @@ msgstr "Ficheros de tipo %s no son soportados"
msgid "Failed to open archive when installing app"
msgstr "Fallo de apertura de fichero mientras se instala la aplicación"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "La aplicación no suministra un fichero info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "La aplicación no puede ser instalada por tener código no autorizado en la aplicación"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "El directorio de la aplicación ya existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -180,7 +193,7 @@ msgstr "%s ingresar el nombre de la base de datos"
#: setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
-msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
+msgstr "%s puede utilizar puntos en el nombre de la base de datos"
#: setup/mssql.php:20
#, php-format
@@ -274,14 +287,14 @@ msgstr "hace segundos"
#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
#: template/functions.php:99
msgid "today"
@@ -294,8 +307,8 @@ msgstr "ayer"
#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
#: template/functions.php:102
msgid "last month"
@@ -304,8 +317,8 @@ msgstr "mes pasado"
#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
#: template/functions.php:104
msgid "last year"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 10adfedf5005432c70fb97b5f15f92864d27d4c9..32d2de1aad91fec66804e7f99d647b9e97d1978d 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -8,15 +8,16 @@
# ggam <ggam@brainleakage.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
# qdneren <renanqd@yahoo.com.mx>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
# scambra <sergio@programatica.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 08:01+0000\n"
-"Last-Translator: eadeprado <eadeprado@outlook.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgstr "Error de autenticación"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr "Su nombre fue cambiado."
+msgstr "Su nombre de usuario ha sido cambiado."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
@@ -91,55 +92,59 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la aplicacion."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizado a {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Espere, por favor...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Error mientras se desactivaba la aplicación"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Error mientras se activaba la aplicación"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizando...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error mientras se actualizaba la aplicación"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:217
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
+
+#: js/personal.js:284
msgid "Saving..."
msgstr "Guardando..."
@@ -155,16 +160,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "No se puede eliminar el usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Administrador del Grupo"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -184,7 +189,7 @@ msgstr "Error al crear usuario"
msgid "A valid password must be provided"
msgstr "Se debe proporcionar una contraseña valida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Castellano"
@@ -199,7 +204,7 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web."
+msgstr "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -218,13 +223,13 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr "Módulo 'fileinfo' perdido"
+msgstr "No se ha encontrado el módulo \"fileinfo\""
#: templates/admin.php:47
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
+msgstr "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
#: templates/admin.php:58
msgid "Locale not working"
@@ -287,7 +292,7 @@ msgstr "Permitir enlaces"
#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
#: templates/admin.php:143
msgid "Allow public uploads"
@@ -350,11 +355,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -378,11 +383,11 @@ msgstr "Seleccionar una aplicación"
#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
-msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
+msgstr "Ver la página de aplicaciones en apps.owncloud.com"
#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
#: templates/help.php:4
msgid "User Documentation"
@@ -414,14 +419,14 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr "Mostrar asistente para iniciar otra vez"
+msgstr "Mostrar asistente para iniciar de nuevo"
#: templates/personal.php:27
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contraseña"
@@ -445,7 +450,7 @@ msgstr "Nueva contraseña"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -461,40 +466,68 @@ msgstr "Su dirección de correo"
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
-msgstr "Ayúdnos a traducir"
+msgstr "Ayúdanos a traducir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "La aplicación de cifrado no está activada, descifre sus archivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Contraseña de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Descifrar archivos"
#: templates/users.php:21
msgid "Login Name"
@@ -518,30 +551,30 @@ msgstr "Introduzca la contraseña de recuperación para recuperar los archivos d
msgid "Default Storage"
msgstr "Almacenamiento predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Otro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nombre de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Cambiar nombre a mostrar"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index a823ac157489a2d6b4b98daa976f844dd5d18c26..5751894003734cb1c83d865760554127f3fa4827 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -6,14 +6,15 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# ordenet <roberto@ordenet.com>, 2013
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 18:23+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +95,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos."
#: templates/settings.php:12
msgid ""
@@ -159,7 +160,7 @@ msgstr "Filtro de inicio de sesión de usuario"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -169,7 +170,7 @@ msgstr "Lista de filtros de usuario"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -179,7 +180,7 @@ msgstr "Filtro de grupo"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -217,7 +218,7 @@ msgstr "Deshabilitar servidor principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Conectar sólo con el servidor de réplica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -240,7 +241,7 @@ msgstr "Apagar la validación por certificado SSL."
msgid ""
"Not recommended, use it for testing only! If connection only works with this"
" option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -260,7 +261,7 @@ msgstr "Campo de nombre de usuario a mostrar"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "El campo LDAP a usar para generar el nombre para mostrar del usuario."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -284,7 +285,7 @@ msgstr "Campo de nombre de grupo a mostrar"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "El campo LDAP a usar para generar el nombre para mostrar del grupo."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -350,7 +351,7 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -369,7 +370,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -391,7 +392,7 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index b880f91c7a99d4de78296d5ccb11eddadcfeb56b..a1d0cf3900ae7b44b9fbce9d8b0b5cdc52016a53 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -7,14 +7,15 @@
# Art O. Pal <artopal@fastmail.fm>, 2012
# pggx999 <pggx999@gmail.com>, 2012
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 05:50+0000\n"
-"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:30+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "Autenticación de WevDAV"
+msgstr "Autenticación mediante WevDAV"
#: templates/settings.php:4
msgid "Address: "
@@ -35,4 +36,4 @@ msgid ""
"The user credentials will be sent to this address. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
+msgstr "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 6dd2898c492fa0a456e44c1c895b87b736c9006a..570b13d5cca97ddcad7cba426cf3173b1c413432 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -29,28 +29,28 @@ msgstr "grupo"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modo de mantenimiento activado"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modo de mantenimiento desactivado"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de datos actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualizando caché de archivos, esto puede tardar mucho tiempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Caché de archivos actualizada"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% hecho ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -91,6 +91,26 @@ msgstr "No se seleccionaron categorías para borrar."
msgid "Error removing %s from favorites."
msgstr "Error al borrar %s de favoritos. "
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -167,59 +187,59 @@ msgstr "noviembre"
msgid "December"
msgstr "diciembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hoy"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "años atrás"
@@ -227,22 +247,26 @@ msgstr "años atrás"
msgid "Choose"
msgstr "Elegir"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error al cargar la plantilla del seleccionador de archivos"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr "El tipo de objeto no está especificado. "
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -272,7 +296,7 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error al compartir"
@@ -328,67 +352,67 @@ msgstr "Asignar fecha de vencimiento"
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "borrar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "e-mail mandado"
@@ -403,10 +427,10 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -472,7 +496,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -523,7 +547,7 @@ msgstr "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura."
#: templates/installation.php:32
msgid ""
@@ -548,7 +572,7 @@ msgstr "Tu directorio de datos y tus archivos probablemente son accesibles a tra
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -601,7 +625,7 @@ msgstr "Completar la instalación"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Cerrar la sesión"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 3a53061ec6937e6408159b5dd9019d7a7d76cf82..68680594d1868f332d8c1aab648977bcaf48cd81 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -5,14 +5,15 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
# juliabis, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: cnngimenez\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -161,24 +162,24 @@ msgstr "deshacer"
#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetas"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{carpetas} y {archivos}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Subiendo %n archivo"
+msgstr[1] "Subiendo %n archivos"
#: js/filelist.js:628
msgid "files uploading"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 7c6c7ae472c8b4eb6cbf3f92da16edfc58906ebd..c01c38b8342c7fd7e2855425e8a4858e8faaf112 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-06 20:20+0000\n"
+"Last-Translator: cnngimenez\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -62,20 +63,20 @@ msgid ""
"files."
msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
-msgstr ""
+msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index b2d33b62c5910320af67f2b500b4af2f8ee928c0..cea65819e726030c263f40f880c9271f24f00d16 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,27 +32,27 @@ msgstr "Enviar"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Perdón, este enlace parece no funcionar más."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Las causas podrían ser:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "el elemento fue borrado"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "el enlace expiró"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "compartir está desactivado"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
#: templates/public.php:15
#, php-format
@@ -64,7 +64,7 @@ msgstr "%s compartió la carpeta %s con vos"
msgid "%s shared the file %s with you"
msgstr "%s compartió el archivo %s con vos"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -76,6 +76,6 @@ msgstr "Subir"
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "La vista preliminar no está disponible para"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index bdec790f40d33688902c48111d45168bec0d14b6..cf833c421a973e893adf19b510e7c60f64028c2c 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-10 13:50+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "No fue posible borrar %s de manera permanente"
msgid "Couldn't restore %s"
msgstr "No se pudo restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Error"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "Borrar archivo de manera permanente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Borrar de manera permanente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Borrado"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n directorio"
+msgstr[1] "%n directorios"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "recuperado"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 47441f17a35d4c18c6b2d9e82edc363333ee955b..91f5d7e581fc5a9b3fb8b09cfb8f1075638f0226 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 20:00+0000\n"
+"Last-Translator: cnngimenez\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,16 +29,16 @@ msgstr "Versiones"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Falló al revertir {file} a la revisión {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Más versiones..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "No hay más versiones disponibles"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Recuperar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 1ae0a4d355b84525b641a0b6364c54c9fad68e2c..17cc36ca73214629b1e7b17274290df6570b70c0 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "No fue especificado el nombre de la app"
#: app.php:361
msgid "Help"
@@ -49,11 +49,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "No se pudo actualizar \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servicios web sobre los que tenés control"
@@ -87,59 +99,59 @@ msgstr "Descargá los archivos en partes más chicas, de forma separada, o pedí
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "No se especificó el origen al instalar la app"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "No se especificó href al instalar la app"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "No se especificó PATH al instalar la app desde el archivo local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "No hay soporte para archivos de tipo %s"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Error al abrir archivo mientras se instalaba la app"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "La app no suministra un archivo info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "No puede ser instalada la app por tener código no autorizado"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "No se puede instalar la app porque no es compatible con esta versión de ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "El directorio de la app ya existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "No se puede crear el directorio para la app. Corregí los permisos. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -265,51 +277,51 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoy"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ayer"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "el mes pasado"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "el año pasado"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "años atrás"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 94c0ce3af87f14979a634de4cb59a98a5dece76d..e91cf0d7808c484422ba982372190cf4351ee3d0 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -5,12 +5,13 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +87,59 @@ msgstr "No es posible borrar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la App."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizar a {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Por favor, esperá...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Se ha producido un error mientras se deshabilitaba la aplicación"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Se ha producido un error mientras se habilitaba la aplicación"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizando...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error al actualizar App"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:217
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
+
+#: js/personal.js:284
msgid "Saving..."
msgstr "Guardando..."
@@ -150,16 +155,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible borrar usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Borrar"
@@ -179,7 +184,7 @@ msgstr "Error creando usuario"
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Castellano (Argentina)"
@@ -194,7 +199,7 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr ""
+msgstr "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -209,7 +214,7 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -231,7 +236,7 @@ msgid ""
"System locale can't be set to %s. This means that there might be problems "
"with certain characters in file names. We strongly suggest to install the "
"required packages on your system to support %s."
-msgstr ""
+msgstr "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +249,7 @@ msgid ""
"installation of 3rd party apps don´t work. Accessing files from remote and "
"sending of notification emails might also not work. We suggest to enable "
"internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +263,11 @@ msgstr "Ejecutá una tarea con cada pagina cargada."
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto."
#: templates/admin.php:120
msgid "Sharing"
@@ -320,14 +325,14 @@ msgstr "Forzar HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL"
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +350,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +421,7 @@ msgstr "Mostrar de nuevo el asistente de primera ejecución"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usás <strong>%s</strong> de los <strong>%s</strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contraseña"
@@ -440,7 +445,7 @@ msgstr "Nueva contraseña:"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -456,40 +461,68 @@ msgstr "Tu dirección de e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Escribí una dirección de e-mail para restablecer la contraseña"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Encriptación"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Clave de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Desencriptar todos los archivos"
#: templates/users.php:21
msgid "Login Name"
@@ -513,30 +546,30 @@ msgstr "Ingresá la contraseña de recuperación para recuperar los archivos de
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Otros"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nombre de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Cambiar el nombre mostrado"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 2e1635a672f2daeaa647e5f202c0db0481bb1320..fbe5fabbcf3d59730d52f6ce0e0aa56eefd4ac21 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-11 11:00+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -91,7 +91,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos."
#: templates/settings.php:12
msgid ""
@@ -156,7 +156,7 @@ msgstr "Filtro de inicio de sesión de usuario"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -166,7 +166,7 @@ msgstr "Lista de filtros de usuario"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -176,7 +176,7 @@ msgstr "Filtro de grupo"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -214,7 +214,7 @@ msgstr "Deshabilitar el Servidor Principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Conectarse únicamente al servidor de réplica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -237,7 +237,7 @@ msgstr "Desactivar la validación por certificado SSL."
msgid ""
"Not recommended, use it for testing only! If connection only works with this"
" option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -257,7 +257,7 @@ msgstr "Campo de nombre de usuario a mostrar"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de usuario mostrado."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -281,7 +281,7 @@ msgstr "Campo de nombre de grupo a mostrar"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de grupo mostrado."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -347,7 +347,7 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados)."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -366,7 +366,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -388,7 +388,7 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index e40f809b1bfd1cf3cca2ea888ab743f73bca0bdc..ce23b27c7bf4f3c0db16c5efe9efe278051f89cb 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -6,13 +6,14 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
# cjtess <claudio.tessone@gmail.com>, 2013
# cjtess <claudio.tessone@gmail.com>, 2012
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 19:30+0000\n"
+"Last-Translator: cnngimenez\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,15 +23,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "Autenticación de WevDAV"
+msgstr "Autenticación de WebDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Dirección:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..9a6e9cbb0958352f290f5f24a2338382c4f801b8
--- /dev/null
+++ b/l10n/es_MX/core.po
@@ -0,0 +1,671 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:387
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:853
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:854
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:855
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:856
+msgid "today"
+msgstr ""
+
+#: js/js.js:857
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:858
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:859
+msgid "last month"
+msgstr ""
+
+#: js/js.js:860
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:861
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:862
+msgid "last year"
+msgstr ""
+
+#: js/js.js:863
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:645 js/share.js:657
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:131 js/share.js:685
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr ""
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:245
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:352
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:354
+msgid "access control"
+msgstr ""
+
+#: js/share.js:357
+msgid "create"
+msgstr ""
+
+#: js/share.js:360
+msgid "update"
+msgstr ""
+
+#: js/share.js:363
+msgid "delete"
+msgstr ""
+
+#: js/share.js:366
+msgid "share"
+msgstr ""
+
+#: js/share.js:400 js/share.js:632
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:645
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:657
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:672
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:683
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:37
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..0e1dc47804e166ac011bc067bc435335282227a3
--- /dev/null
+++ b/l10n/es_MX/files.po
@@ -0,0 +1,335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:165
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:239
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:244 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:192
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:307
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:432
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:563
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:628
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:563 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:564 templates/index.php:81
+msgid "Size"
+msgstr ""
+
+#: js/files.js:565 templates/index.php:83
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:88 templates/index.php:89
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:94 templates/index.php:95
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:108
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:110
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:118
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..0aa9dac64883faeae3eb2474b6bb356751e8ac06
--- /dev/null
+++ b/l10n/es_MX/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:250
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6b6cd618ba31a6379366a8d9c996d412a48fb24
--- /dev/null
+++ b/l10n/es_MX/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:457
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..3cce6ac339f6dccbec4367a40743b3a00e25d3c6
--- /dev/null
+++ b/l10n/es_MX/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..42fb8a7b1f2564304bbedfff5281774910f52cb9
--- /dev/null
+++ b/l10n/es_MX/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/es_MX/files_versions.po b/l10n/es_MX/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..b1866ae6ce36c3fb67a411a143c462f866ff66bc
--- /dev/null
+++ b/l10n/es_MX/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..7861d1b48366b8a0854741acd721ee82601adc93
--- /dev/null
+++ b/l10n/es_MX/lib.po
@@ -0,0 +1,334 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
+msgid "Help"
+msgstr ""
+
+#: app.php:374
+msgid "Personal"
+msgstr ""
+
+#: app.php:385
+msgid "Settings"
+msgstr ""
+
+#: app.php:397
+msgid "Users"
+msgstr ""
+
+#: app.php:410
+msgid "Admin"
+msgstr ""
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr ""
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:99
+msgid "today"
+msgstr ""
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr ""
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:104
+msgid "last year"
+msgstr ""
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr ""
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e4d80e5f68314614bbaf3c9763dce75daca3dc1e
--- /dev/null
+++ b/l10n/es_MX/settings.po
@@ -0,0 +1,572 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: 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
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:284
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:277
+msgid "add group"
+msgstr ""
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:246 templates/personal.php:164
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..54dc1b5192a24d82cb3aa2951de574bbf386d12e
--- /dev/null
+++ b/l10n/es_MX/user_ldap.po
@@ -0,0 +1,406 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr ""
diff --git a/l10n/es_MX/user_webdavauth.po b/l10n/es_MX/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..9948a588c8b0b02431fe53d52b20d78cd65fe105
--- /dev/null
+++ b/l10n/es_MX/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 95b66e51b7a2fa26bad892c485b1b5a6ecdefd61..7e163f5efcd16d348e8dcd1e40727c5d143eb6fb 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Kustutamiseks pole kategooriat valitud."
msgid "Error removing %s from favorites."
msgstr "Viga %s eemaldamisel lemmikutest."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Pühapäev"
@@ -168,59 +188,59 @@ msgstr "November"
msgid "December"
msgstr "Detsember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut tagasi"
msgstr[1] "%n minutit tagasi"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tund tagasi"
msgstr[1] "%n tundi tagasi"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "täna"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "eile"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päev tagasi"
msgstr[1] "%n päeva tagasi"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuu tagasi"
msgstr[1] "%n kuud tagasi"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "aastat tagasi"
@@ -228,22 +248,26 @@ msgstr "aastat tagasi"
msgid "Choose"
msgstr "Vali"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Viga failivalija malli laadimisel"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "Objekti tüüp pole määratletud."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Viga"
@@ -273,7 +297,7 @@ msgstr "Jagatud"
msgid "Share"
msgstr "Jaga"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Viga jagamisel"
@@ -329,67 +353,67 @@ msgstr "Määra aegumise kuupäev"
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ühtegi inimest ei leitud"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "loo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uuenda"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "kustuta"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "jaga"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-kiri on saadetud"
@@ -404,7 +428,7 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://git
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s parooli lähtestus"
@@ -473,7 +497,7 @@ msgstr "Isiklik"
msgid "Users"
msgstr "Kasutajad"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Rakendused"
@@ -602,7 +626,7 @@ msgstr "Lõpeta seadistamine"
msgid "%s is available. Get more information on how to update."
msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logi välja"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 79f5e340cfbf3320879900a8839cefcce8db6a91..943c2186c0caf433528600d07e894f60b4a70a53 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +171,7 @@ msgstr[1] "%n faili"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} ja {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 557d32037ad89444915ba3094e0ed8ce9da9964d..438e1fb60a32ad7e5883aa4814f2b48df03e9063 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s jagas sinuga kausta %s"
msgid "%s shared the file %s with you"
msgstr "%s jagas sinuga faili %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lae alla"
@@ -77,6 +77,6 @@ msgstr "Lae üles"
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Eelvaadet pole saadaval"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 4e49c86def2301f9ddf93ea7d2583bab33e5b5a4..4883978e98ac1df34aba9f85a57eda3c7ce4c23a 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 05:20+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -50,11 +50,23 @@ msgstr "Kasutajad"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ebaõnnestunud uuendus \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "veebitenused sinu kontrolli all"
@@ -107,37 +119,37 @@ msgstr "%s tüüpi arhiivid pole toetatud"
msgid "Failed to open archive when installing app"
msgstr "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Rakend ei paku ühtegi info.xml faili"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Rakendi kataloog on juba olemas"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
@@ -266,51 +278,51 @@ msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide s
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minutit tagasi"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n tundi tagasi"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "täna"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "eile"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n päeva tagasi"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "viimasel kuul"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n kuud tagasi"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "viimasel aastal"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "aastat tagasi"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 26f50de9298fbe6389c44c368243e526020d47dd..99a5ced11e1104422e6c8a025f360165ed71e104 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 05:10+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -86,55 +86,59 @@ msgstr "Kasutajat ei saa eemaldada grupist %s"
msgid "Couldn't update app."
msgstr "Rakenduse uuendamine ebaõnnestus."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Uuenda versioonile {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Lülita välja"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Lülita sisse"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Palun oota..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Viga rakendi keelamisel"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Viga rakendi lubamisel"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Uuendamine..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Viga rakenduse uuendamisel"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Viga"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Uuenda"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Salvestamine..."
@@ -150,16 +154,16 @@ msgstr "tagasi"
msgid "Unable to remove user"
msgstr "Kasutaja eemaldamine ebaõnnestus"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Kustuta"
@@ -179,7 +183,7 @@ msgstr "Viga kasutaja loomisel"
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Eesti"
@@ -345,11 +349,11 @@ msgstr "Rohkem"
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Näita veelkord Esmase Käivituse Juhendajat"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parool"
@@ -440,7 +444,7 @@ msgstr "Uus parool"
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Näidatav nimi"
@@ -456,38 +460,66 @@ msgstr "Sinu e-posti aadress"
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Krüpteerimine"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Sisselogimise parool"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekrüpteeri kõik failid"
@@ -513,30 +545,30 @@ msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käig
msgid "Default Storage"
msgstr "Vaikimisi maht"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Piiramatult"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Muu"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Kasutajanimi"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Maht"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "muuda näidatavat nime"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "määra uus parool"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index f0267918f4d3ff4f7806f2bcfb51a1b60dca3d51..bdc18ee7dba2d96261d67095384f7411ee590d8b 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-22 10:36-0400\n"
-"PO-Revision-Date: 2013-08-22 09:40+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 962c4efed51c4367c3a9048afe650e0e92f609ac..6c943bef9ee54a746dfef0bc35f4657e1301863e 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
msgid "Error removing %s from favorites."
msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Igandea"
@@ -168,59 +188,59 @@ msgstr "Azaroa"
msgid "December"
msgstr "Abendua"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "gaur"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "urte"
@@ -228,22 +248,26 @@ msgstr "urte"
msgid "Choose"
msgstr "Aukeratu"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ados"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "Objetu mota ez dago zehaztuta."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Errorea"
@@ -273,7 +297,7 @@ msgstr "Elkarbanatuta"
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
@@ -329,67 +353,67 @@ msgstr "Ezarri muga data"
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "sortu"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "eguneratu"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Eposta bidalia"
@@ -404,7 +428,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s pasahitza berrezarri"
@@ -473,7 +497,7 @@ msgstr "Pertsonala"
msgid "Users"
msgstr "Erabiltzaileak"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikazioak"
@@ -602,7 +626,7 @@ msgstr "Bukatu konfigurazioa"
msgid "%s is available. Get more information on how to update."
msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Saioa bukatu"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 4456f2df9e30b10a336234d7b7ea3311425a7862..d48f767a56af8acc4d979fd65d61d9221a94e7f2 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 36bdac1c072c9857d516932b26f76ab010930f32..ce629410a61ed944d7064f3d29b5c21fdd9c7d18 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:10+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%sk zurekin %s karpeta elkarbanatu du"
msgid "%s shared the file %s with you"
msgstr "%sk zurekin %s fitxategia elkarbanatu du"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Deskargatu"
@@ -76,6 +76,6 @@ msgstr "Igo"
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ez dago aurrebista eskuragarririk hauentzat "
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index cb9bb315d4a99e6cbae6b825b66ecd9dae0dfcdf..017ba3930fdcbda0ceed168b497eb87eafb74e74 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -50,11 +50,23 @@ msgstr "Erabiltzaileak"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ezin izan da \"%s\" eguneratu."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
@@ -107,37 +119,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -266,51 +278,51 @@ msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "gaur"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "atzo"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "joan den hilabetean"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "joan den urtean"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "urte"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 617d57288fee8a3792e1b1b435d80ddfb6ef508d..2255ef9ef785a52f122c789ecd622f071529895f 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +86,59 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
msgid "Couldn't update app."
msgstr "Ezin izan da aplikazioa eguneratu."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Eguneratu {appversion}-ra"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Ez-gaitu"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Gaitu"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Itxoin mesedez..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Eguneratzen..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Errorea aplikazioa eguneratzen zen bitartean"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Errorea"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Eguneratu"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Gordetzen..."
@@ -150,16 +154,16 @@ msgstr "desegin"
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ezabatu"
@@ -179,7 +183,7 @@ msgstr "Errore bat egon da erabiltzailea sortzean"
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Euskera"
@@ -345,11 +349,11 @@ msgstr "Gehiago"
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Pasahitza"
@@ -440,7 +444,7 @@ msgstr "Pasahitz berria"
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Bistaratze Izena"
@@ -456,38 +460,66 @@ msgstr "Zure e-posta"
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +545,30 @@ msgstr "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxate
msgid "Default Storage"
msgstr "Lehenetsitako Biltegiratzea"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Mugarik gabe"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Bestelakoa"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Erabiltzaile izena"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Biltegiratzea"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "aldatu bistaratze izena"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ezarri pasahitz berria"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index e9c2fb101c7813bac5145b12573ebe27818ad9a8..7712a3e1d1820702340fc20e5949033305ab2338 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 477f3475fc5ce83dcbc7739fa9b710d1e1d1417f..c0dfd2514b83815b52fbe4073c352568e73e7bd9 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است
msgid "Error removing %s from favorites."
msgstr "خطای پاک کردن %s از علاقه مندی ها."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "یکشنبه"
@@ -167,55 +187,55 @@ msgstr "نوامبر"
msgid "December"
msgstr "دسامبر"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "امروز"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "ماههای قبل"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "سالهای قبل"
@@ -223,22 +243,26 @@ msgstr "سالهای قبل"
msgid "Choose"
msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "قبول"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -248,7 +272,7 @@ msgstr "نوع شی تعیین نشده است."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خطا"
@@ -268,7 +292,7 @@ msgstr "اشتراک گذاشته شده"
msgid "Share"
msgstr "اشتراکگذاری"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "خطا درحال به اشتراک گذاشتن"
@@ -324,67 +348,67 @@ msgstr "تنظیم تاریخ انقضا"
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "کسی یافت نشد"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ایجاد"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "به روز"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "درحال ارسال ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ایمیل ارسال شد"
@@ -399,7 +423,7 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +492,7 @@ msgstr "شخصی"
msgid "Users"
msgstr "کاربران"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr " برنامه ها"
@@ -597,7 +621,7 @@ msgstr "اتمام نصب"
msgid "%s is available. Get more information on how to update."
msgstr "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "خروج"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 1db2606ef50d2a50143b9dfd079d014f363ec958..4c7fbe5528e00fdc66d1171ed1a938eb61575f1f 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 84ebd4737a295ad3a415c194b07a511c594caeb3..14a3c4edfa7251c355aa1dfc224b8d3efb227092 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
msgid "%s shared the file %s with you"
msgstr "%sفایل %s را با شما به اشتراک گذاشت"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "دانلود"
@@ -76,6 +76,6 @@ msgstr "بارگزاری"
msgid "Cancel upload"
msgstr "متوقف کردن بار گذاری"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "هیچگونه پیش نمایشی موجود نیست"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 565794cd0d15ebcc542b255adfd1c5b0830fc9ac..e395df54b9c3498bfa6955ab940c41e1c8d81461 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "کاربران"
msgid "Admin"
msgstr "مدیر"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "سرویس های تحت وب در کنترل شما"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,47 +277,47 @@ msgstr "احتمالاً وب سرور شما طوری تنظیم نشده اس
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "امروز"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "دیروز"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ماه قبل"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "سال قبل"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "سالهای قبل"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 015429708da2f85f7aec7dd36f0d3efccb62d2c8..2682e4f12368a144fe1be97fdbd450df814f1181 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "امکان حذف کاربر از گروه %s نیست"
msgid "Couldn't update app."
msgstr "برنامه را نمی توان به هنگام ساخت."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "بهنگام شده به {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "غیرفعال"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "فعال"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "لطفا صبر کنید ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "در حال بروز رسانی..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "خطا در هنگام بهنگام سازی برنامه"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خطا"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "به روز رسانی"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
@@ -149,16 +153,16 @@ msgstr "بازگشت"
msgid "Unable to remove user"
msgstr "حذف کاربر امکان پذیر نیست"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "حذف"
@@ -178,7 +182,7 @@ msgstr "خطا در ایجاد کاربر"
msgid "A valid password must be provided"
msgstr "رمز عبور صحیح باید وارد شود"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +348,11 @@ msgstr "بیشتر"
msgid "Less"
msgstr "کمتر"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "راهبری کمکی اجرای اول را دوباره نمایش ب
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "گذرواژه"
@@ -439,7 +443,7 @@ msgstr "گذرواژه جدید"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "نام نمایشی"
@@ -455,38 +459,66 @@ msgstr "پست الکترونیکی شما"
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "زبان"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr "در حین تغییر رمز عبور به منظور بازیابی ف
msgid "Default Storage"
msgstr "ذخیره سازی پیش فرض"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "نامحدود"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "دیگر"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "نام کاربری"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "حافظه"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "تغییر نام نمایشی"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "تنظیم کلمه عبور جدید"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index dabbd41a9cecf5bae2759eb17686b14096e8ddc7..9496f28720188d6dbd5f48741d9144acfd015419 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index f76c82e4827b7998a8ce3d8cf5085420189ddbde..7935371a417301c577cab56a9761b2cb2a2f9881 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Luokkia ei valittu poistettavaksi."
msgid "Error removing %s from favorites."
msgstr "Virhe poistaessa kohdetta %s suosikeista."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "sunnuntai"
@@ -168,59 +188,59 @@ msgstr "marraskuu"
msgid "December"
msgstr "joulukuu"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "tänään"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "vuotta sitten"
@@ -228,22 +248,26 @@ msgstr "vuotta sitten"
msgid "Choose"
msgstr "Valitse"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Virhe"
@@ -273,7 +297,7 @@ msgstr "Jaettu"
msgid "Share"
msgstr "Jaa"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
@@ -329,67 +353,67 @@ msgstr "Aseta päättymispäivä"
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "luo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "päivitä"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "poista"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "jaa"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Sähköposti lähetetty"
@@ -404,7 +428,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s salasanan nollaus"
@@ -473,7 +497,7 @@ msgstr "Henkilökohtainen"
msgid "Users"
msgstr "Käyttäjät"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Sovellukset"
@@ -602,7 +626,7 @@ msgstr "Viimeistele asennus"
msgid "%s is available. Get more information on how to update."
msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Kirjaudu ulos"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 2c0837f88bcd0e7f7524012fc0322b89e8745b83..34fe35c6ce93a0a8f53942034074203314869cf5 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 17:20+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+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"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index d9687472967084f6e524c345987a26767a0b9d8d..b3dea67b9279f7e211e9a3da8bda5db413a51882 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# muro <janne.morsky@metropolia.fi>, 2013
# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 19:20+0000\n"
+"Last-Translator: muro <janne.morsky@metropolia.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
#: ajax/adminrecovery.php:29
msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Palautusavain kytketty päälle onnistuneesti"
#: ajax/adminrecovery.php:34
msgid ""
@@ -62,20 +63,20 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
#: js/settings-admin.js:11
msgid "Saving..."
@@ -93,7 +94,7 @@ msgstr ""
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "henkilökohtaiset asetukset"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -106,7 +107,7 @@ msgstr ""
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Palautusavaimen salasana"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Ei käytössä"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Vaihda palautusavaimen salasana:"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Vanha palautusavaimen salasana"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Uusi palautusavaimen salasana"
#: templates/settings-admin.php:53
msgid "Change Password"
@@ -148,11 +149,11 @@ msgstr ""
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Vanha kirjautumis-salasana"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Nykyinen kirjautumis-salasana"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
@@ -160,7 +161,7 @@ msgstr ""
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Ota salasanan palautus käyttöön:"
#: templates/settings-personal.php:47
msgid ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index fd6c9d78d87ea92087cc4b820fae100065db080b..a2ffb0fc8272e8557ec31bf7b4a1fc1686dd4804 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s jakoi kansion %s kanssasi"
msgid "%s shared the file %s with you"
msgstr "%s jakoi tiedoston %s kanssasi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lataa"
@@ -76,6 +76,6 @@ msgstr "Lähetä"
msgid "Cancel upload"
msgstr "Peru lähetys"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ei esikatselua kohteelle"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index fcd9edec0e477412c282d3f62277e09b5bf34fbd..f6134419be07d161a3ccc1ea227451e13a2efe65 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -49,11 +49,23 @@ msgstr "Käyttäjät"
msgid "Admin"
msgstr "Ylläpitäjä"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
@@ -106,37 +118,37 @@ msgstr "Tyypin %s arkistot eivät ole tuettuja"
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Sovellus ei sisällä info.xml-tiedostoa"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Sovelluskansio on jo olemassa"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s"
@@ -265,51 +277,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "tänään"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "eilen"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "viime kuussa"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "viime vuonna"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "vuotta sitten"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 92f6acfd299cc84a429752e8192e3a8b353fc6ce..b9581c966b466fbf1838a0ed913f2499a2a6eaa6 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -85,55 +85,59 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
msgid "Couldn't update app."
msgstr "Sovelluksen päivitys epäonnistui."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Päivitä versioon {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Poista käytöstä"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Käytä"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Odota hetki..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Virhe poistaessa sovellusta käytöstä"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Virhe ottaessa sovellusta käyttöön"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Päivitetään..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Virhe sovellusta päivittäessä"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Virhe"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Päivitä"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -149,16 +153,16 @@ msgstr "kumoa"
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Poista"
@@ -178,7 +182,7 @@ msgstr "Virhe käyttäjää luotaessa"
msgid "A valid password must be provided"
msgstr "Anna kelvollinen salasana"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_kielen_nimi_"
@@ -344,11 +348,11 @@ msgstr "Enemmän"
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Salasana"
@@ -439,7 +443,7 @@ msgstr "Uusi salasana"
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Näyttönimi"
@@ -455,38 +459,66 @@ msgstr "Sähköpostiosoitteesi"
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Salaus"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Salaussovellus ei ole enää käytössä, pura kaikkien tiedostojesi salaus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Pura kaikkien tiedostojen salaus"
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Oletustallennustila"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Rajoittamaton"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Muu"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Käyttäjätunnus"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Tallennustila"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "vaihda näyttönimi"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "aseta uusi salasana"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 394517b92922190ca254c25d5f85ec6d1c9072f8..fb7a03660481ab92d2144928a992e16d4d279b2c 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 4215f9dc597ef955e52334c20e5b9cdbf601d252..7ba9214216e748ddb57bd22f76387a0b25bbf216 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
-"PO-Revision-Date: 2013-09-03 09:30+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"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"
@@ -95,6 +95,26 @@ msgstr "Pas de catégorie sélectionnée pour la suppression."
msgid "Error removing %s from favorites."
msgstr "Erreur lors de la suppression de %s des favoris."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Dimanche"
@@ -171,59 +191,59 @@ msgstr "novembre"
msgid "December"
msgstr "décembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:813
+#: js/js.js:854
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:814
+#: js/js.js:855
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:815
+#: js/js.js:856
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "hier"
-#: js/js.js:817
+#: js/js.js:858
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:818
+#: js/js.js:859
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:819
+#: js/js.js:860
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:820
+#: js/js.js:861
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -231,22 +251,26 @@ msgstr "il y a plusieurs années"
msgid "Choose"
msgstr "Choisir"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Erreur de chargement du modèle du sélecteur de fichier"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -256,7 +280,7 @@ msgstr "Le type d'objet n'est pas spécifié."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erreur"
@@ -276,7 +300,7 @@ msgstr "Partagé"
msgid "Share"
msgstr "Partager"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
@@ -332,67 +356,67 @@ msgstr "Spécifier la date d'expiration"
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "créer"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "supprimer"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partager"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email envoyé"
@@ -407,7 +431,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "Réinitialisation de votre mot de passe %s"
@@ -476,7 +500,7 @@ msgstr "Personnel"
msgid "Users"
msgstr "Utilisateurs"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applications"
@@ -605,7 +629,7 @@ msgstr "Terminer l'installation"
msgid "%s is available. Get more information on how to update."
msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Se déconnecter"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index aca2838806211cf3291e7250c5c519b569d06a8a..f3e3767ce8b2aae20738ce071c098da6f5bb0254 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -6,13 +6,14 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# MathieuP <mathieu.payrol@gmail.com>, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:42-0400\n"
-"PO-Revision-Date: 2013-09-03 09:25+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,13 +50,13 @@ msgstr "Aucune erreur, le fichier a été envoyé avec succès."
#: ajax/upload.php:67
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:"
+msgstr "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:"
#: ajax/upload.php:69
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
+msgstr "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
#: ajax/upload.php:70
msgid "The uploaded file was only partially uploaded"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 6f0ea28d9c5f99d50122571760d7459b9754e24c..c9b74a2e271fe41a5a71bb322d8e1b7b4871c272 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
-"PO-Revision-Date: 2013-09-03 11:10+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index bc0c4a9abbdb20f6dc177c87158cdb2717c92180..547f24c023034e544fb3c0bb222c48a8d16a2ddb 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
# Cyril Glapa <kyriog@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:44-0400\n"
-"PO-Revision-Date: 2013-09-03 09:30+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +24,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Aucun nom d'application spécifié"
#: app.php:361
msgid "Help"
@@ -49,9 +50,21 @@ msgstr "Utilisateurs"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
+msgstr "Echec de la mise à niveau \"%s\"."
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
msgstr ""
#: defaults.php:35
@@ -61,7 +74,7 @@ msgstr "services web sous votre contrôle"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "impossible d'ouvrir \"%s\""
#: files.php:226
msgid "ZIP download is turned off."
@@ -83,63 +96,63 @@ msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés.
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
+msgstr "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur."
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Aucune source spécifiée pour installer l'application"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Aucun href spécifié pour installer l'application par http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Les archives de type %s ne sont pas supportées"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'application ne fournit pas de fichier info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "L'application ne peut être installée car elle contient du code non-autorisé"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Le dossier de l'application existe déjà"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -315,7 +328,7 @@ msgstr "il y a plusieurs années"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Causé par :"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index fd619afbb0cf406b946f03f71b0a66a5a23bb00c..aab0b21d49725b3b715839be75686bcc84cbd5a4 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:44-0400\n"
-"PO-Revision-Date: 2013-09-03 09:50+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -132,11 +132,15 @@ msgstr "Mettre à jour"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Enregistrement..."
@@ -152,16 +156,16 @@ msgstr "annuler"
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Supprimer"
@@ -181,7 +185,7 @@ msgstr "Erreur lors de la création de l'utilisateur"
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Français"
@@ -347,11 +351,11 @@ msgstr "Plus"
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "Revoir le premier lancement de l'installeur"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Mot de passe"
@@ -442,7 +446,7 @@ msgstr "Nouveau mot de passe"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nom affiché"
@@ -458,38 +462,66 @@ msgstr "Votre adresse e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Mot de passe de connexion"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Déchiffrer tous les fichiers"
@@ -515,30 +547,30 @@ msgstr "Entrer le mot de passe de récupération dans le but de récupérer les
msgid "Default Storage"
msgstr "Support de stockage par défaut"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Illimité"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Autre"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nom d'utilisateur"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Support de stockage"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Changer le nom affiché"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Changer le mot de passe"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 9729b2532b7027fc7639028a1cac18bc31606b66..5d5731c15756684cc9e41ce3d6f20b06628ea718 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
# plachance <patlachance@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -91,7 +92,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
#: templates/settings.php:12
msgid ""
@@ -156,7 +157,7 @@ msgstr "Modèle d'authentification utilisateurs"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -166,7 +167,7 @@ msgstr "Filtre d'utilisateurs"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -176,7 +177,7 @@ msgstr "Filtre de groupes"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -214,7 +215,7 @@ msgstr "Désactiver le serveur principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Se connecter uniquement au serveur de replica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -237,7 +238,7 @@ msgstr "Désactiver la validation du certificat SSL."
msgid ""
"Not recommended, use it for testing only! If connection only works with this"
" option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -257,7 +258,7 @@ msgstr "Champ \"nom d'affichage\" de l'utilisateur"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -281,7 +282,7 @@ msgstr "Champ \"nom d'affichage\" du groupe"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer le nom de groupe affiché."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -347,7 +348,7 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -366,7 +367,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -388,7 +389,7 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index d24a55c6e23a6f058fa9b0ec9fd0b4faae4fc64a..ef68307bdd258d6def05cee60eb131750d0a4cdf 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -7,15 +7,16 @@
# Christophe Lherieau <skimpax@gmail.com>, 2013
# mishka, 2013
# ouafnico <nicolas@shivaserv.fr>, 2012
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
# Robert Di Rosa <>, 2012
# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
-"PO-Revision-Date: 2013-09-03 10:00+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 13:50+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 6565f0ea8d9eda29423306555c576ca6c8865ccd..ac5a3fc0f0a4e4700922ddaa3645723bd0d6665d 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Non se seleccionaron categorías para eliminación."
msgid "Error removing %s from favorites."
msgstr "Produciuse un erro ao eliminar %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -167,59 +187,59 @@ msgstr "novembro"
msgid "December"
msgstr "decembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hoxe"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "onte"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "hai %n día"
msgstr[1] "hai %n días"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "último mes"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "último ano"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "anos atrás"
@@ -227,22 +247,26 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escoller"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr "Non se especificou o tipo de obxecto."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erro"
@@ -272,7 +296,7 @@ msgstr "Compartir"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
@@ -328,67 +352,67 @@ msgstr "Definir a data de caducidade"
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Non se permite volver a compartir"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eliminar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Correo enviado"
@@ -403,7 +427,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "Restabelecer o contrasinal %s"
@@ -472,7 +496,7 @@ msgstr "Persoal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicativos"
@@ -601,7 +625,7 @@ msgstr "Rematar a configuración"
msgid "%s is available. Get more information on how to update."
msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Desconectar"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 6de09cdb0f79033b687390fb51b141f23d9dbe57..f1ef8190bbcf80c83a7736ffd4c815d13874c03a 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+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"
@@ -170,7 +170,7 @@ msgstr[1] "%n ficheiros"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} e {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 887502a08beefc4f215bf7b8131b508bd9658f6a..bd0b79c5d8bec456428c4b8a08fc081eecb7983f 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s compartiu o cartafol %s con vostede"
msgid "%s shared the file %s with you"
msgstr "%s compartiu o ficheiro %s con vostede"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -76,6 +76,6 @@ msgstr "Enviar"
msgid "Cancel upload"
msgstr "Cancelar o envío"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Sen vista previa dispoñíbel para"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 48006ace76f0e23f11dac291aa21eb559188526e..430902b2c236cc8cee610343c9880d75034d0bfc 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-29 08:30+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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,11 +49,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Non foi posíbel anovar «%s»."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
@@ -106,37 +118,37 @@ msgstr "Os arquivos do tipo %s non están admitidos"
msgid "Failed to open archive when installing app"
msgstr "Non foi posíbel abrir o arquivo ao instalar aplicativos"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "O aplicativo non fornece un ficheiro info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Non é posíbel instalar o aplicativo por mor de conter código non permitido"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Xa existe o directorio do aplicativo"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s"
@@ -265,51 +277,51 @@ msgstr "O seu servidor web non está aínda configurado adecuadamente para permi
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoxe"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "onte"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "hai %n día"
msgstr[1] "hai %n días"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "último mes"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "último ano"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index e04bf9e31b2c1a5b1d1706a6c9c9693f1b689a58..58154e88f4970b26e90edcb68fd3b3d4c8f556ae 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-28 22:30+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -129,11 +129,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando ficheiros... isto pode levar un anaco."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Gardando..."
@@ -149,16 +153,16 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posíbel retirar o usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -178,7 +182,7 @@ msgstr "Produciuse un erro ao crear o usuario"
msgid "A valid password must be provided"
msgstr "Debe fornecer un contrasinal"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Galego"
@@ -344,11 +348,11 @@ msgstr "Máis"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "Amosar o axudante da primeira execución outra vez"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasinal"
@@ -439,7 +443,7 @@ msgstr "Novo contrasinal"
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Amosar o nome"
@@ -455,38 +459,66 @@ msgstr "O seu enderezo de correo"
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "o aplicativo de cifrado non está activado, descifrar todos os ficheiros"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Contrasinal de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Descifrar todos os ficheiros"
@@ -512,30 +544,30 @@ msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos
msgid "Default Storage"
msgstr "Almacenamento predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Sen límites"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "cambiar o nome visíbel"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "estabelecer un novo contrasinal"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 5e1d0d000e339fd4f5cbbce657b9c5615ffad5bb..54fdccd2c352a75999ddeff9c1ded9735f9e42a5 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 11:20+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index a505ffebd5392ba72c3b2eb3c0a5d1d84485f1b9..ecb35c7ac736654ecd8ee83e8e94f472fbc76c26 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "לא נבחרו קטגוריות למחיקה"
msgid "Error removing %s from favorites."
msgstr "שגיאה בהסרת %s מהמועדפים."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "יום ראשון"
@@ -168,59 +188,59 @@ msgstr "נובמבר"
msgid "December"
msgstr "דצמבר"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "לפני %n דקה"
msgstr[1] "לפני %n דקות"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "לפני %n שעה"
msgstr[1] "לפני %n שעות"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "היום"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "לפני %n יום"
msgstr[1] "לפני %n ימים"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "לפני %n חודש"
msgstr[1] "לפני %n חודשים"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "חודשים"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "שנים"
@@ -228,22 +248,26 @@ msgstr "שנים"
msgid "Choose"
msgstr "בחירה"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "שגיאה בטעינת תבנית בחירת הקבצים"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "לא"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "בסדר"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "סוג הפריט לא צוין."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "שגיאה"
@@ -273,7 +297,7 @@ msgstr "שותף"
msgid "Share"
msgstr "שתף"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "שגיאה במהלך השיתוף"
@@ -329,67 +353,67 @@ msgstr "הגדרת תאריך תפוגה"
msgid "Expiration date"
msgstr "תאריך התפוגה"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "שיתוף באמצעות דוא״ל:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "לא נמצאו אנשים"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "אסור לעשות שיתוף מחדש"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} עם {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "יצירה"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "עדכון"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "שיתוף"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "אירעה שגיאה בביטול תאריך התפוגה"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "הודעת הדוא״ל נשלחה"
@@ -404,7 +428,7 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -473,7 +497,7 @@ msgstr "אישי"
msgid "Users"
msgstr "משתמשים"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "יישומים"
@@ -602,7 +626,7 @@ msgstr "סיום התקנה"
msgid "%s is available. Get more information on how to update."
msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "התנתקות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index dd480450974234e2e259802334d262f9d46e593b..653e107a6e2a4a512531b5d5040067f05db08db7 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 0af4dee2ecc82ad8f11523eee9656588441fb955..c181aa3c1eeef2b0c1ec4634d57c8920c9dcbec0 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s שיתף עמך את התיקייה %s"
msgid "%s shared the file %s with you"
msgstr "%s שיתף עמך את הקובץ %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "הורדה"
@@ -75,6 +75,6 @@ msgstr "העלאה"
msgid "Cancel upload"
msgstr "ביטול ההעלאה"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "אין תצוגה מקדימה זמינה עבור"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index d344f07c5972ed59b3c0f9acc4856e51348c0075..d5ee81ab17acec454730f9ed001312ee9035e87f 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "משתמשים"
msgid "Admin"
msgstr "מנהל"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "שירותי רשת תחת השליטה שלך"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכר
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "שניות"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "לפני %n דקות"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "לפני %n שעות"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "היום"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "אתמול"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "לפני %n ימים"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "חודש שעבר"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "לפני %n חודשים"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "שנה שעברה"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "שנים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 767a3252701fb173061b5f3dee73f74b3d124bc5..7115b110ec1d7ff79d23d33a603b1aa79a710030 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
msgid "Couldn't update app."
msgstr "לא ניתן לעדכן את היישום."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "עדכון לגרסה {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "בטל"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "הפעלה"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "נא להמתין…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "מתבצע עדכון…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "אירעה שגיאה בעת עדכון היישום"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "שגיאה"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "עדכון"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "מעודכן"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "שמירה…"
@@ -149,16 +153,16 @@ msgstr "ביטול"
msgid "Unable to remove user"
msgstr "לא ניתן להסיר את המשתמש"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "מנהל הקבוצה"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "מחיקה"
@@ -178,7 +182,7 @@ msgstr "יצירת המשתמש נכשלה"
msgid "A valid password must be provided"
msgstr "יש לספק ססמה תקנית"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "עברית"
@@ -344,11 +348,11 @@ msgstr "יותר"
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "גרסא"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "הצגת אשף ההפעלה הראשונית שוב"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "סיסמא"
@@ -439,7 +443,7 @@ msgstr "ססמה חדשה"
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "שם תצוגה"
@@ -455,38 +459,66 @@ msgstr "כתובת הדוא״ל שלך"
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "פה"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "הצפנה"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "אחסון בררת המחדל"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ללא הגבלה"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "אחר"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "שם משתמש"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "אחסון"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "החלפת שם התצוגה"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "הגדרת ססמה חדשה"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "בררת מחדל"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index af6906d1973e5bd97cf4c838605e3854dd627d19..23b74eb81c3d2e917a409c4cde56f0a812b12486 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index dd5f832c464444ecbb40234917a69f39321476f0..c90f0a411370cabfa6f5f82b80b02340c4b89fae 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
-"PO-Revision-Date: 2013-09-03 11:00+0000\n"
-"Last-Translator: Debanjum <debanjum@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -92,6 +92,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "रविवार"
@@ -168,59 +188,59 @@ msgstr "नवंबर"
msgid "December"
msgstr "दिसम्बर"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "सेटिंग्स"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -228,22 +248,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "त्रुटि"
@@ -273,7 +297,7 @@ msgstr ""
msgid "Share"
msgstr "साझा करें"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -329,67 +353,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "भेजा जा रहा है"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ईमेल भेज दिया गया है "
@@ -404,7 +428,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -473,7 +497,7 @@ msgstr "यक्तिगत"
msgid "Users"
msgstr "उपयोगकर्ता"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -602,7 +626,7 @@ msgstr "सेटअप समाप्त करे"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "लोग आउट"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 1b0fd22ba82c2f86e728ac94180966b0c029dd25..c9f6dc720fd32f77fdf7b3401a4b15e42d93bfdb 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 60c81ec7b5a025757813a17e88e6b0a569519a28..e930c1b8889a3d7b18cd22ccb932abda4b2c988c 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "उपयोगकर्ता"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index dc541066ba0c7530c4360263549081f34c94856a..4e7d9242b24799c39e8e74a41a84c134c1e7a915 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "त्रुटि"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "अद्यतन"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "पासवर्ड"
@@ -438,7 +442,7 @@ msgstr "नया पासवर्ड"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "प्रयोक्ता का नाम"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 053000fe64ca35a2d0c0ad71f803557e1e7eff8b..61c20ec61715010595ab6be6d57e3ef8a82cceae 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 693dc056589bad46edd92bf388112e9a985c4aba..d8b8a3018c3cb93e1dcc32a3f7fe2866ce760e5a 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Niti jedna kategorija nije odabrana za brisanje."
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "nedelja"
@@ -166,63 +186,63 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "danas"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "godina"
@@ -230,22 +250,26 @@ msgstr "godina"
msgid "Choose"
msgstr "Izaberi"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "U redu"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Greška"
@@ -275,7 +299,7 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
@@ -331,67 +355,67 @@ msgstr "Postavi datum isteka"
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "kreiraj"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "izbriši"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "djeli"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -406,7 +430,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr "Osobno"
msgid "Users"
msgstr "Korisnici"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikacije"
@@ -604,7 +628,7 @@ msgstr "Završi postavljanje"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b576a0b7cb1e9329040a5314252b4f94ad0ada5c..fad167ba7b8685d5c5f8c5acbdc14e15311f3d91 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Greška"
@@ -127,60 +127,60 @@ msgstr ""
msgid "Rename"
msgstr "Promjeni ime"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "U tijeku"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "zamjeni"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "predloži ime"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "odustani"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "vrati"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr "datoteke se učitavaju"
@@ -218,15 +218,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Ime"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Veličina"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Zadnja promjena"
@@ -303,33 +303,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Preuzimanje"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Makni djeljenje"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Prijenos je preobiman"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Datoteke se skeniraju, molimo pričekajte."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index ee7cc3cc6798c042c4f8c3376a2a21fc7273dda9..308e9e9875577f4c756aa2ffc2cce487896b3a45 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Preuzimanje"
@@ -75,6 +75,6 @@ msgstr "Učitaj"
msgid "Cancel upload"
msgstr "Prekini upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 5072e42a3070c371ddd5387c461de70b7b7155a6..4450ee5f5d90f9877ef5ad3c8baea96a10d9dc26 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Korisnici"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundi prije"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "danas"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "jučer"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "prošli mjesec"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "prošlu godinu"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "godina"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index a1d1484aab7b058151529304acd8c4cd2e9034c2..13772a829053312053212779a9dc32343cfcf912 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Isključi"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Uključi"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Greška"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Spremanje..."
@@ -148,16 +152,16 @@ msgstr "vrati"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Obriši"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__ime_jezika__"
@@ -343,11 +347,11 @@ msgstr "više"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lozinka"
@@ -438,7 +442,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Vaša e-mail adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "ostali"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Korisničko ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index bbd09586144e99b65de885af17ee9a4dbc8ed7c9..1d665b257f679dcdf59bb1f6e66b7867b1ff3a2f 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index b4bbc39644548d8be0d1d186d614d29f9c26050a..18378d4b15d30c7e185841ca1c912d2dde3749f2 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Nincs törlésre jelölt kategória"
msgid "Error removing %s from favorites."
msgstr "Nem sikerült a kedvencekből törölni ezt: %s"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "vasárnap"
@@ -168,59 +188,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "ma"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "tavaly"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "több éve"
@@ -228,22 +248,26 @@ msgstr "több éve"
msgid "Choose"
msgstr "Válasszon"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "Az objektum típusa nincs megadva."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Hiba"
@@ -273,7 +297,7 @@ msgstr "Megosztott"
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
@@ -329,67 +353,67 @@ msgstr "Legyen lejárati idő"
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "létrehoz"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "töröl"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "megoszt"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Az emailt elküldtük"
@@ -404,7 +428,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -473,7 +497,7 @@ msgstr "Személyes"
msgid "Users"
msgstr "Felhasználók"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Alkalmazások"
@@ -602,7 +626,7 @@ msgstr "A beállítások befejezése"
msgid "%s is available. Get more information on how to update."
msgstr "%s rendelkezésre áll. További információ a frissítéshez."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Kilépés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 402bd7233614f00dcddcde7f974e74ba92d76d47..7843881e215c9bc997b8f0a2a8e5a7a49c780883 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 43059eac1fccd50975dcc3c6dbeee459a30cd0c0..ae03dc98f23c6b6958875aef42c3e228564c9618 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s megosztotta Önnel ezt a mappát: %s"
msgid "%s shared the file %s with you"
msgstr "%s megosztotta Önnel ezt az állományt: %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Letöltés"
@@ -76,6 +76,6 @@ msgstr "Feltöltés"
msgid "Cancel upload"
msgstr "A feltöltés megszakítása"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nem áll rendelkezésre előnézet ehhez: "
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 58c1b28f6cdd8a245126280c7b4042d4f8a4d711..6cd771a902443ac431c2cc1658f1d86a2c459c74 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -50,11 +50,23 @@ msgstr "Felhasználók"
msgid "Admin"
msgstr "Adminsztráció"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Sikertelen Frissítés \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
@@ -107,37 +119,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -266,51 +278,51 @@ msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pár másodperce"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ma"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "tegnap"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "múlt hónapban"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "tavaly"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "több éve"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index a04fb4488eaf95400b06472ae7006d82ef904af7..93228ebc6c70bc8abe1f253e412fd2fbf25126d2 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -87,55 +87,59 @@ msgstr "A felhasználó nem távolítható el ebből a csoportból: %s"
msgid "Couldn't update app."
msgstr "A program frissítése nem sikerült."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Frissítés erre a verzióra: {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Letiltás"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "engedélyezve"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Kérem várjon..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Frissítés folyamatban..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Hiba történt a programfrissítés közben"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Hiba"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Frissítés"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Frissítve"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Mentés..."
@@ -151,16 +155,16 @@ msgstr "visszavonás"
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolítáni"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Törlés"
@@ -180,7 +184,7 @@ msgstr "A felhasználó nem hozható létre"
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -346,11 +350,11 @@ msgstr "Több"
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -417,7 +421,7 @@ msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Jelszó"
@@ -441,7 +445,7 @@ msgstr "Az új jelszó"
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "A megjelenített név"
@@ -457,38 +461,66 @@ msgstr "Az Ön email címe"
msgid "Fill in an email address to enable password recovery"
msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Segítsen a fordításban!"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Titkosítás"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -514,30 +546,30 @@ msgstr "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetr
msgid "Default Storage"
msgstr "Alapértelmezett tárhely"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Korlátlan"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Más"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Felhasználónév"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Tárhely"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "a megjelenített név módosítása"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "új jelszó beállítása"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 166a16c7f8179cb4b72c4b142f17804a455821b8..5b24b22ffd6e2dcc15bddb476a08bf8ea2205328 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 9d22bb2fd79f4e51a41823d3a382e9c36745cbd7..3200bbb85343c97003c0f552b398a514d7ff6e22 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Կիրակի"
@@ -166,59 +186,59 @@ msgstr "Նոյեմբեր"
msgid "December"
msgstr "Դեկտեմբեր"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 63acadec4f140b172f61c695d4bc9ed0024fa4e4..d1e8def17c4dd41a922e9edd5adff3fe0b34c49b 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index fe701e6fee7bf23e77c75aaa5e7a6683b2b2550b..35712856251f8c3f8fb4a6beb38561a5ef88f0fa 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ջնջել"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Այլ"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 7dfa76c49ea51d844f9d87f3d257bc174f8e85d3..51ad0cc856fe0f50ad0fbefeec25995373ac82ea 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Dominica"
@@ -166,59 +186,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usatores"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applicationes"
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Clauder le session"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 97ce4fab714639a3350208b52bf6a9c1bf3cc697..391f76c987c833f86490b4ecfedf662ee2ea7f7d 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Error"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Nomine"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Dimension"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Modificate"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Nihil hic. Incarga alcun cosa!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Discargar"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Deler"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Incargamento troppo longe"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 6fb91fb6c7ead5c350d2a969084e7a51b70efec3..83dfe3acf59faeff12865047ce6c5a6847b6a655 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Discargar"
@@ -75,6 +75,6 @@ msgstr "Incargar"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 5a963a58e296dd4978857774c4aae956b4f566d0..3f1800a5b6a5b8b5c1cf280767c539dddedce4b1 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Usatores"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index d43c46e1de059d3e0db297876d9311af931f4c6e..dfe9a6ffe847681a5b39094182f25646743db5b3 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualisar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Deler"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Interlingua"
@@ -343,11 +347,11 @@ msgstr "Plus"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasigno"
@@ -438,7 +442,7 @@ msgstr "Nove contrasigno"
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Tu adresse de e-posta"
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Linguage"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nomine de usator"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index a8bd30ff193071d82c7413148017b935511a9220..d67d3ec71b9409291f393db32f578e39377c97b1 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 071ac769a960c1da7cb665dfecdb6b1897e56fba..6330d1f9d2e95bb689e78a136646d37e0d56a19f 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Tidak ada kategori terpilih untuk dihapus."
msgid "Error removing %s from favorites."
msgstr "Galat ketika menghapus %s dari favorit"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Minggu"
@@ -166,55 +186,55 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hari ini"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -222,22 +242,26 @@ msgstr "beberapa tahun lalu"
msgid "Choose"
msgstr "Pilih"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Oke"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr "Tipe objek tidak ditentukan."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Galat"
@@ -267,7 +291,7 @@ msgstr "Dibagikan"
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
@@ -323,67 +347,67 @@ msgstr "Setel tanggal kedaluwarsa"
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "dapat mengedit"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "buat"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "perbarui"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "hapus"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "bagikan"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Dilindungi sandi"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Galat ketika menyetel tanggal kedaluwarsa"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email terkirim"
@@ -398,7 +422,7 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "Pribadi"
msgid "Users"
msgstr "Pengguna"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikasi"
@@ -596,7 +620,7 @@ msgstr "Selesaikan instalasi"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Keluar"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 5d512ec38db9acc3e8908d9798870bfc2861b881..2ce822890c644ee73610b3488c1bacf210622483 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr "URL tidak boleh kosong"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Galat"
@@ -127,54 +127,54 @@ msgstr "Hapus secara permanen"
msgid "Rename"
msgstr "Ubah nama"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Menunggu"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} sudah ada"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "sarankan nama"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "batalkan"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr "mengganti {new_name} dengan {old_name}"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "urungkan"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr "berkas diunggah"
@@ -212,15 +212,15 @@ msgid ""
"big."
msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Nama"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Dimodifikasi"
@@ -297,33 +297,33 @@ msgstr "Anda tidak memiliki izin menulis di sini."
msgid "Nothing in here. Upload something!"
msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Unduh"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Hapus"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Yang diunggah terlalu besar"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Berkas sedang dipindai, silakan tunggu."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Yang sedang dipindai"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 1a7fb0fbb081806e14ad5c49cc2f52e0481f667d..4c5ff880016877c7dfbfb786bf0f63320bdeb6e8 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s membagikan folder %s dengan Anda"
msgid "%s shared the file %s with you"
msgstr "%s membagikan file %s dengan Anda"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Unduh"
@@ -75,6 +75,6 @@ msgstr "Unggah"
msgid "Cancel upload"
msgstr "Batal pengunggahan"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Tidak ada pratinjau tersedia untuk"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 1b7a594f547209a21a3c6209494cca7af0ed2251..8aa1ab9b7cee1072c233cf947e6b4c5b409b7f0f 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Pengguna"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "layanan web dalam kontrol Anda"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hari ini"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "kemarin"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "bulan kemarin"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "tahun kemarin"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "beberapa tahun lalu"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 4940f179f89996a76c7d0d36ff6ab4c5c09b0cad..5f0fefa325daa6d3c31e014294beab7a8d234f17 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s"
msgid "Couldn't update app."
msgstr "Tidak dapat memperbarui aplikasi."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Perbarui ke {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Nonaktifkan"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "aktifkan"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Mohon tunggu...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Memperbarui...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Gagal ketika memperbarui aplikasi"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Galat"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Perbarui"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Menyimpan..."
@@ -148,16 +152,16 @@ msgstr "urungkan"
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grup"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Hapus"
@@ -177,7 +181,7 @@ msgstr "Gagal membuat pengguna"
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Lainnya"
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "Tampilkan Penuntun Konfigurasi Awal"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Sandi"
@@ -438,7 +442,7 @@ msgstr "Sandi baru"
msgid "Change password"
msgstr "Ubah sandi"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nama Tampilan"
@@ -454,38 +458,66 @@ msgstr "Alamat email Anda"
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Enkripsi"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Penyimpanan Baku"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Tak terbatas"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Lainnya"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nama pengguna"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Penyimpanan"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ubah nama tampilan"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "setel sandi baru"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index e165b0b8d33f0ad70a144410cb0a15891e85c3d0..bb775d8df95e66822118619aa445aadea6fa96c2 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 643a8c16821bdb08e1841066b4e5879dcdae9e62..a9ac3082288d25ae014f0d3fbcbd30cb24ed3d93 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Enginn flokkur valinn til eyðingar."
msgid "Error removing %s from favorites."
msgstr "Villa við að fjarlægja %s úr eftirlæti."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sunnudagur"
@@ -167,59 +187,59 @@ msgstr "Nóvember"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "í dag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mánuðir síðan"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "einhverjum árum"
@@ -227,22 +247,26 @@ msgstr "einhverjum árum"
msgid "Choose"
msgstr "Veldu"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Í lagi"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr "Tegund ekki tilgreind"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Villa"
@@ -272,7 +296,7 @@ msgstr "Deilt"
msgid "Share"
msgstr "Deila"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Villa við deilingu"
@@ -328,67 +352,67 @@ msgstr "Setja gildistíma"
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "mynda"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uppfæra"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eyða"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deila"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistíma"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistíma"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Tölvupóstur sendur"
@@ -403,7 +427,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr "Um mig"
msgid "Users"
msgstr "Notendur"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Forrit"
@@ -601,7 +625,7 @@ msgstr "Virkja uppsetningu"
msgid "%s is available. Get more information on how to update."
msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Útskrá"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 10e1d535f4035cc8ada6fa2723a6a82da99b0456..b5561e490042112115f0cbe1199f6e5b76df9eef 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr "Vefslóð má ekki vera tóm."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Villa"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr "Endurskýra"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Bíður"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} er þegar til"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "yfirskrifa"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "stinga upp á nafni"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "hætta við"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr "yfirskrifaði {new_name} með {old_name}"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "afturkalla"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Nafn"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Stærð"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Breytt"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Ekkert hér. Settu eitthvað inn!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Niðurhal"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Hætta deilingu"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Eyða"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Innsend skrá er of stór"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Er að skima"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 20e744006b83ae3f38db3568d4ef8992d941cf9f..bfd1462e0561c1a47870de6038994ffafffa28e7 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s deildi möppunni %s með þér"
msgid "%s shared the file %s with you"
msgstr "%s deildi skránni %s með þér"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Niðurhal"
@@ -75,6 +75,6 @@ msgstr "Senda inn"
msgid "Cancel upload"
msgstr "Hætta við innsendingu"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Yfirlit ekki í boði fyrir"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index a1bfd8deb4bdb614bc8968e8f03e4ab06eba62c4..c814613bdc2fe0a12dc156cb9ce0ce88f9c8a6b7 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Notendur"
msgid "Admin"
msgstr "Stjórnun"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "vefþjónusta undir þinni stjórn"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sek."
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "í dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "í gær"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "síðasta mánuði"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "síðasta ári"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "einhverjum árum"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 5f777e83b7c378901e1fe9d85df0e4544b19c13c..f444914ef0d0a1e49d77659542e2cf7d8278c414 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Gera óvirkt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Virkja"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Andartak...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Uppfæri..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Villa"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Uppfæra"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Uppfært"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Er að vista ..."
@@ -149,16 +153,16 @@ msgstr "afturkalla"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eyða"
@@ -178,7 +182,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
@@ -344,11 +348,11 @@ msgstr "Meira"
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lykilorð"
@@ -439,7 +443,7 @@ msgstr "Nýtt lykilorð"
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Vísa nafn"
@@ -455,38 +459,66 @@ msgstr "Netfangið þitt"
msgid "Fill in an email address to enable password recovery"
msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Tungumál"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Sjálfgefin gagnageymsla"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ótakmarkað"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annað"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Notendanafn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "gagnapláss"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 389e4c206efd965edd34912525eda86e23a23719..5f4609f359bbae18b85765961add4cd3df3debd6 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index e5cdd51793d7510439bb9c6608cfb98678bfe9cf..10f3e72f5d7a00e7728ce2d2c479cf2ad9dd47f9 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -93,6 +93,26 @@ msgstr "Nessuna categoria selezionata per l'eliminazione."
msgid "Error removing %s from favorites."
msgstr "Errore durante la rimozione di %s dai preferiti."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domenica"
@@ -169,59 +189,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Dicembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "oggi"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "anni fa"
@@ -229,22 +249,26 @@ msgstr "anni fa"
msgid "Choose"
msgstr "Scegli"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Errore durante il caricamento del modello del selezionatore di file"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -254,7 +278,7 @@ msgstr "Il tipo di oggetto non è specificato."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Errore"
@@ -274,7 +298,7 @@ msgstr "Condivisi"
msgid "Share"
msgstr "Condividi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
@@ -330,67 +354,67 @@ msgstr "Imposta data di scadenza"
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creare"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aggiornare"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimina"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "condividi"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Messaggio inviato"
@@ -405,7 +429,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "Ripristino password di %s"
@@ -474,7 +498,7 @@ msgstr "Personale"
msgid "Users"
msgstr "Utenti"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applicazioni"
@@ -603,7 +627,7 @@ msgstr "Termina la configurazione"
msgid "%s is available. Get more information on how to update."
msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Esci"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 58b33501e9e2e56f4d09d5b60a0e11f6b6fc036c..b97ed259366acd5b96a26dea3b943d4e64df90d9 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 15:54+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index f314ab509b10b01abc6b541fb6515942caeb01a7..01ae61c6aea21327bf43d549c37f2b8a83457695 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s ha condiviso la cartella %s con te"
msgid "%s shared the file %s with you"
msgstr "%s ha condiviso il file %s con te"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Scarica"
@@ -77,6 +77,6 @@ msgstr "Carica"
msgid "Cancel upload"
msgstr "Annulla il caricamento"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nessuna anteprima disponibile per"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index fb5632409a4a0f3bc6017eeb1318d6bf93201a2f..2fa3217657f64a7ab1556e5a41a94b9a6d4a86f9 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 13:30+0000\n"
-"Last-Translator: polxmod <paolo.velati@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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,11 +51,23 @@ msgstr "Utenti"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Aggiornamento non riuscito \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
@@ -108,37 +120,37 @@ msgstr "Gli archivi di tipo %s non sono supportati"
msgid "Failed to open archive when installing app"
msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "L'applicazione non fornisce un file info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non shipped"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "La cartella dell'applicazione esiste già"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 2ef86dac4392aba382f622c48a239d6415059c0a..cb888134db5f9224a414545142d6f162e87dacd9 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 15:53+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -132,11 +132,15 @@ msgstr "Aggiorna"
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Salvataggio in corso..."
@@ -152,16 +156,16 @@ msgstr "annulla"
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Elimina"
@@ -181,7 +185,7 @@ msgstr "Errore durante la creazione dell'utente"
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Italiano"
@@ -347,11 +351,11 @@ msgstr "Altro"
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "Mostra nuovamente la procedura di primo avvio"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Password"
@@ -442,7 +446,7 @@ msgstr "Nuova password"
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome visualizzato"
@@ -458,38 +462,66 @@ msgstr "Il tuo indirizzo email"
msgid "Fill in an email address to enable password recovery"
msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Lingua"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifratura"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Password di accesso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decifra tutti i file"
@@ -515,30 +547,30 @@ msgstr "Digita la password di ripristino per recuperare i file degli utenti dura
msgid "Default Storage"
msgstr "Archiviazione predefinita"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Illimitata"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome utente"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Archiviazione"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "cambia il nome visualizzato"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "imposta una nuova password"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index e39ae95e863f676085c68878e473699d27771a20..5e50a6b6e6532abfd1a2a81e5c9b4db34c08dda7 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 06:40+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 38ce1ffd25b6673edfe4df7437020daea25b0292..b9f05311701ae6b19b93a77151615815e895f669 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 09:50+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"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"
@@ -94,6 +94,26 @@ msgstr "削除するカテゴリが選択されていません。"
msgid "Error removing %s from favorites."
msgstr "お気に入りから %s の削除エラー"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "日"
@@ -170,55 +190,55 @@ msgstr "11月"
msgid "December"
msgstr "12月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "数秒前"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分前"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間後"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "今日"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 日後"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "一月前"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n カ月後"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "月前"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "一年前"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "年前"
@@ -226,22 +246,26 @@ msgstr "年前"
msgid "Choose"
msgstr "選択"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "ファイルピッカーのテンプレートの読み込みエラー"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "いいえ"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr "オブジェクタイプが指定されていません。"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "エラー"
@@ -271,7 +295,7 @@ msgstr "共有中"
msgid "Share"
msgstr "共有"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "共有でエラー発生"
@@ -327,67 +351,67 @@ msgstr "有効期限を設定"
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "編集可能"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "作成"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "削除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "共有"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "メールを送信しました"
@@ -402,7 +426,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s パスワードリセット"
@@ -471,7 +495,7 @@ msgstr "個人"
msgid "Users"
msgstr "ユーザ"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "アプリ"
@@ -600,7 +624,7 @@ msgstr "セットアップを完了します"
msgid "%s is available. Get more information on how to update."
msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "ログアウト"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 249beb05f613747d35d7f6242c64b97671af7589..bcb42ff87e3f57768f13ff12b5ea76121f475f3e 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 00:40+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index a2bd99586b9935c8c62650514e8668e3f095b8ec..71e37cb9fda29e8c730c9fccb786b5e317e00749 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s はフォルダー %s をあなたと共有中です"
msgid "%s shared the file %s with you"
msgstr "%s はファイル %s をあなたと共有中です"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ダウンロード"
@@ -76,6 +76,6 @@ msgstr "アップロード"
msgid "Cancel upload"
msgstr "アップロードをキャンセル"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "プレビューはありません"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 78f827004879c11e9bb2a1586581c424c180f42e..c910ea9099386bf8072c93865df270a2f2dfd673 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# plazmism <gomidori@live.jp>, 2013
# Koichi MATSUMOTO <mzch@me.com>, 2013
# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 01:10+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -50,11 +51,23 @@ msgstr "ユーザ"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" へのアップグレードに失敗しました。"
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "管理下のウェブサービス"
@@ -107,37 +120,37 @@ msgstr "\"%s\"タイプのアーカイブ形式は未サポート"
msgid "Failed to open archive when installing app"
msgstr "アプリをインストール中にアーカイブファイルを開けませんでした。"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "アプリにinfo.xmlファイルが入っていません"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "アプリで許可されないコードが入っているのが原因でアプリがインストールできません"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストール出来ません。"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "アプリディレクトリは既に存在します"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index e265ca7d47506d7f6d27db3799c5c7a9cc634dec..b0dd14f55848f0fc87d4e36bc06959ba504e54a1 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 00:40+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -131,11 +131,15 @@ msgstr "更新"
msgid "Updated"
msgstr "更新済み"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "保存中..."
@@ -151,16 +155,16 @@ msgstr "元に戻す"
msgid "Unable to remove user"
msgstr "ユーザを削除出来ません"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "グループ"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "グループ管理者"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "削除"
@@ -180,7 +184,7 @@ msgstr "ユーザ作成エラー"
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Japanese (日本語)"
@@ -346,11 +350,11 @@ msgstr "もっと見る"
msgid "Less"
msgstr "閉じる"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "バージョン"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -417,7 +421,7 @@ msgstr "初回ウィザードを再表示する"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "パスワード"
@@ -441,7 +445,7 @@ msgstr "新しいパスワードを入力"
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "表示名"
@@ -457,38 +461,66 @@ msgstr "あなたのメールアドレス"
msgid "Fill in an email address to enable password recovery"
msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "言語"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "翻訳に協力する"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "暗号化"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "ログインパスワード"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "すべてのファイルを複合する"
@@ -514,30 +546,30 @@ msgstr "パスワード変更の間のユーザーのファイルを回復する
msgid "Default Storage"
msgstr "デフォルトストレージ"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "無制限"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "その他"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ユーザー名"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "ストレージ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "表示名を変更"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "新しいパスワードを設定"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index cbbbfc99a47c4cdce8f16ccc139729eda74ff5c9..9b1f34b05cf7f9b9a7a8fb3fa2075e842d51f47f 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 09:10+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index d8e95837373a9b4105bf975574a277e094bb54d2..90fa5a82e67fed35081fb9508702314ae9a01300 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,55 +186,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "დღეს"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -222,22 +242,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +291,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +347,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "პერსონა"
msgid "Users"
msgstr "მომხმარებლები"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,7 +620,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 64ba60942076c8ff7e519a2fd0d7a734eebba611..efd2890682d94b122f50e50d47f728273511c2ed 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "გადმოწერა"
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index d28838e8f0c55d487b6673e2cdc94e1ed7b7b6b5..13336d9871dffe56d954bbe3d7000c89ea243afd 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "მომხმარებლები"
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "წამის წინ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "დღეს"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 079d74339ac94f29192c0e717ec5f2a3e2d5924a..8e2b2cb50db2fb51eecbfbd7160ff65caa819182 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "პაროლი"
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 537446f5b40060e10555818ee45d50731ef96f41..69f4675a9c6b605cbba8bf73cc9c4ec96b147aac 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 8cd45561ae0678e5562d095b98e3a1f4ad8aa636..64a9519691be8fc5c2e7a4faf75180b78af8bac2 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "სარედაქტირებელი კატეგორი
msgid "Error removing %s from favorites."
msgstr "შეცდომა %s–ის ფევორიტებიდან წაშლის დროს."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "კვირა"
@@ -166,55 +186,55 @@ msgstr "ნოემბერი"
msgid "December"
msgstr "დეკემბერი"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "პარამეტრები"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "დღეს"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "გასულ თვეში"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "ბოლო წელს"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "წლის წინ"
@@ -222,22 +242,26 @@ msgstr "წლის წინ"
msgid "Choose"
msgstr "არჩევა"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "არა"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "დიახ"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr "ობიექტის ტიპი არ არის მითი
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "შეცდომა"
@@ -267,7 +291,7 @@ msgstr "გაზიარებული"
msgid "Share"
msgstr "გაზიარება"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "შეცდომა გაზიარების დროს"
@@ -323,67 +347,67 @@ msgstr "მიუთითე ვადის გასვლის დრო"
msgid "Expiration date"
msgstr "ვადის გასვლის დრო"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "გააზიარე მეილზე"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "მომხმარებელი არ არის ნაპოვნი"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "გაზიარდა {item}–ში {user}–ის მიერ"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "გაუზიარებადი"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "შექმნა"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "განახლება"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "გაზიარება"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "პაროლით დაცული"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "შეცდომა ვადის გასვლის მითითების დროს"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "გაგზავნა ...."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "იმეილი გაიგზავნა"
@@ -398,7 +422,7 @@ msgstr "განახლება ვერ განხორციელდ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "პირადი"
msgid "Users"
msgstr "მომხმარებელი"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "აპლიკაციები"
@@ -596,7 +620,7 @@ msgstr "კონფიგურაციის დასრულება"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "გამოსვლა"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 36a1787cd340ea7352d5e1b95587148c3133fe61..56fff63712a8e4dd150b3195aee2aa2d02a6a299 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 65b24c1c116509de4d187d28903c20f0a1a9b5eb..c53f2326209db86a7e68939452a97fa8afe61b27 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s–მა გაგიზიარათ ფოლდერი %s"
msgid "%s shared the file %s with you"
msgstr "%s–მა გაგიზიარათ ფაილი %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ჩამოტვირთვა"
@@ -75,6 +75,6 @@ msgstr "ატვირთვა"
msgid "Cancel upload"
msgstr "ატვირთვის გაუქმება"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "წინასწარი დათვალიერება შეუძლებელია"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 0eda718d060ffc26d6a4b9b91c349acf8de5b8bd..b2793d66c77a06184ae15707a4a9f152c2205537 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "მომხმარებელი"
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web services under your control"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr "თქვენი web სერვერი არ არის კო
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "წამის წინ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "დღეს"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "გასულ თვეში"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ბოლო წელს"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "წლის წინ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 793b41c51aa853ebaacee00b8a9954edd9be9c7b..b2b70884df168f9ea96dcd5b68db80aac3a4e34d 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ
msgid "Couldn't update app."
msgstr "ვერ მოხერხდა აპლიკაციის განახლება."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "განაახლე {appversion}–მდე"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "გამორთვა"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "ჩართვა"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "დაიცადეთ...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "მიმდინარეობს განახლება...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "შეცდომა აპლიკაციის განახლების დროს"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "შეცდომა"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "განახლება"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "განახლებულია"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "შენახვა..."
@@ -149,16 +153,16 @@ msgstr "დაბრუნება"
msgid "Unable to remove user"
msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "ჯგუფები"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "ჯგუფის ადმინისტრატორი"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "წაშლა"
@@ -178,7 +182,7 @@ msgstr "შეცდომა მომხმარებლის შექმ
msgid "A valid password must be provided"
msgstr "უნდა მიუთითოთ არსებული პაროლი"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +348,11 @@ msgstr "უფრო მეტი"
msgid "Less"
msgstr "უფრო ნაკლები"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "ვერსია"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "მაჩვენე თავიდან გაშვებული
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "პაროლი"
@@ -439,7 +443,7 @@ msgstr "ახალი პაროლი"
msgid "Change password"
msgstr "პაროლის შეცვლა"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "დისპლეის სახელი"
@@ -455,38 +459,66 @@ msgstr "თქვენი იმეილ მისამართი"
msgid "Fill in an email address to enable password recovery"
msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "ენა"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "თარგმნის დახმარება"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "ენკრიპცია"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "საწყისი საცავი"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ულიმიტო"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "სხვა"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "მომხმარებლის სახელი"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "საცავი"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "შეცვალე დისფლეის სახელი"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "დააყენეთ ახალი პაროლი"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index da010f03eeeb26c24e21febbe5372fc54cdb23be..36128b4046d2916266f7bad6e99e3c27bbeec13d 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/core.po b/l10n/km/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..1ae42ef89fbffeae12555336c2c907a24c9b6873
--- /dev/null
+++ b/l10n/km/core.po
@@ -0,0 +1,667 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:387
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:853
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:854
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: js/js.js:855
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: js/js.js:856
+msgid "today"
+msgstr ""
+
+#: js/js.js:857
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:858
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: js/js.js:859
+msgid "last month"
+msgstr ""
+
+#: js/js.js:860
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: js/js.js:861
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:862
+msgid "last year"
+msgstr ""
+
+#: js/js.js:863
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:645 js/share.js:657
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:131 js/share.js:685
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr ""
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:245
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:352
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:354
+msgid "access control"
+msgstr ""
+
+#: js/share.js:357
+msgid "create"
+msgstr ""
+
+#: js/share.js:360
+msgid "update"
+msgstr ""
+
+#: js/share.js:363
+msgid "delete"
+msgstr ""
+
+#: js/share.js:366
+msgid "share"
+msgstr ""
+
+#: js/share.js:400 js/share.js:632
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:645
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:657
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:672
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:683
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:37
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/km/files.po b/l10n/km/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..286dded35fb9ce14d609c8cb16788c9ab20a6aca
--- /dev/null
+++ b/l10n/km/files.po
@@ -0,0 +1,332 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:165
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:239
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:244 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:192
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:307
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:432
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:563
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: js/filelist.js:628
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:563 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:564 templates/index.php:81
+msgid "Size"
+msgstr ""
+
+#: js/files.js:565 templates/index.php:83
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:88 templates/index.php:89
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:94 templates/index.php:95
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:108
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:110
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:118
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..95e07fb95576817618172620d4fda6a46ccbe30f
--- /dev/null
+++ b/l10n/km/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:250
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..bca243c45970e35f39facedd0bf362f48049bc52
--- /dev/null
+++ b/l10n/km/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:457
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..f12cf3ccbe1ffc8151eacc0383c524cac7bdc864
--- /dev/null
+++ b/l10n/km/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3aa613a53e7d3d7de878e140d61b581ba378fb5
--- /dev/null
+++ b/l10n/km/files_trashbin.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/km/files_versions.po b/l10n/km/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..f9b37bb0cc3fbce5033ce70287eb31a571fdc4ee
--- /dev/null
+++ b/l10n/km/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr ""
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..9937427d825a38eb06bea2d4477c6e921b11a32f
--- /dev/null
+++ b/l10n/km/lib.po
@@ -0,0 +1,330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
+msgid "Help"
+msgstr ""
+
+#: app.php:374
+msgid "Personal"
+msgstr ""
+
+#: app.php:385
+msgid "Settings"
+msgstr ""
+
+#: app.php:397
+msgid "Users"
+msgstr ""
+
+#: app.php:410
+msgid "Admin"
+msgstr ""
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr ""
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: template/functions.php:99
+msgid "today"
+msgstr ""
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr ""
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: template/functions.php:104
+msgid "last year"
+msgstr ""
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr ""
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e32f2e8796c08cbfb1175339a4bab0783d8a292d
--- /dev/null
+++ b/l10n/km/settings.po
@@ -0,0 +1,572 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:284
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:277
+msgid "add group"
+msgstr ""
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:246 templates/personal.php:164
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6be8c9e68f30d4685f755b0b60accba727dccd7
--- /dev/null
+++ b/l10n/km/user_ldap.po
@@ -0,0 +1,406 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr ""
diff --git a/l10n/km/user_webdavauth.po b/l10n/km/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..1b1ffbc4311482d6ba11d1ea94b8381a4787f969
--- /dev/null
+++ b/l10n/km/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 7e2f5e0cca270f8552baf08aa5a1936a4d5c322f..3ee58ec5314a49fab06a4ab5225b8f1d104da3ce 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,55 +186,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -222,22 +242,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +291,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +347,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,7 +620,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 73fe472ef52d9b30565113a33cc8f237789ea0b8..c760138d383eb5118b4f011716ce24dcfb99586b 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index e875108d7cde5ed3e8011eb4ede631a64b7d8d3c..aa346b34b34e886be0a08ddf827016899e01c34b 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 5e7d67575a21d8894dfb77030ec928001eb97185..f1c6f8bdfc44ef9e2d29830e6863bbc2dfb43274 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "삭제할 분류를 선택하지 않았습니다. "
msgid "Error removing %s from favorites."
msgstr "책갈피에서 %s을(를) 삭제할 수 없었습니다."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "일요일"
@@ -168,55 +188,55 @@ msgstr "11월"
msgid "December"
msgstr "12월"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "설정"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "초 전"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "오늘"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "어제"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "지난 달"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "개월 전"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "작년"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "년 전"
@@ -224,22 +244,26 @@ msgstr "년 전"
msgid "Choose"
msgstr "선택"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "승락"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -249,7 +273,7 @@ msgstr "객체 유형이 지정되지 않았습니다."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "오류"
@@ -269,7 +293,7 @@ msgstr "공유됨"
msgid "Share"
msgstr "공유"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "공유하는 중 오류 발생"
@@ -325,67 +349,67 @@ msgstr "만료 날짜 설정"
msgid "Expiration date"
msgstr "만료 날짜"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "이메일로 공유:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "발견된 사람 없음"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "다시 공유할 수 없습니다"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}에서 공유 중"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "공유 해제"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "생성"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "업데이트"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "삭제"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "공유"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "암호로 보호됨"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "만료 날짜 해제 오류"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "만료 날짜 설정 오류"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "전송 중..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "이메일 발송됨"
@@ -400,7 +424,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -469,7 +493,7 @@ msgstr "개인"
msgid "Users"
msgstr "사용자"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "앱"
@@ -598,7 +622,7 @@ msgstr "설치 완료"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "로그아웃"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index f97b6b2dd2697e4b2127a6049749ebed714ad891..1ab0e4053abb68f728e6a605201a33b12b3acd92 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 6de0e6cf3d2cddc20ed32dc279d456a0a0d421c2..434e19ca27ab0b758565655fde5d552df077e9f8 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
msgid "%s shared the file %s with you"
msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "다운로드"
@@ -75,6 +75,6 @@ msgstr "업로드"
msgid "Cancel upload"
msgstr "업로드 취소"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "다음 항목을 미리 볼 수 없음:"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index f320d2ae96d63c3f1a6689dfbdc9a793d5cb3c68..06627a79781404151c67ad3b1dd239b2093ca7f5 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 09:30+0000\n"
-"Last-Translator: chohy <chohy@yahoo.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,11 +50,23 @@ msgstr "사용자"
msgid "Admin"
msgstr "관리자"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" 업그레이드에 실패했습니다."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "내가 관리하는 웹 서비스"
@@ -107,37 +119,37 @@ msgstr "%s 타입 아카이브는 지원되지 않습니다."
msgid "Failed to open archive when installing app"
msgstr "앱을 설치할 때 아카이브를 열지 못했습니다."
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "앱에서 info.xml 파일이 제공되지 않았습니다."
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다. "
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "출하되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다."
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다. "
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "앱 디렉토리가 이미 존재합니다. "
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s "
@@ -266,47 +278,47 @@ msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "초 전"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "오늘"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "어제"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "지난 달"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "작년"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "년 전"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 9556c8739f3c50d09493879f520cf77d1caa5c6e..59c2ed9d37573cef4431237c9fee1789d908d7ce 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음"
msgid "Couldn't update app."
msgstr "앱을 업데이트할 수 없습니다."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "버전 {appversion}(으)로 업데이트"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "비활성화"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "사용함"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "기다려 주십시오...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "업데이트 중...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "앱을 업데이트하는 중 오류 발생"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "오류"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "업데이트"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "업데이트됨"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "저장 중..."
@@ -149,16 +153,16 @@ msgstr "실행 취소"
msgid "Unable to remove user"
msgstr "사용자를 삭제할 수 없음"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "그룹"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "그룹 관리자"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "삭제"
@@ -178,7 +182,7 @@ msgstr "사용자 생성 오류"
msgid "A valid password must be provided"
msgstr "올바른 암호를 입력해야 함"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "한국어"
@@ -344,11 +348,11 @@ msgstr "더 중요함"
msgid "Less"
msgstr "덜 중요함"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "버전"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "첫 실행 마법사 다시 보이기"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "암호"
@@ -439,7 +443,7 @@ msgstr "새 암호"
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "표시 이름"
@@ -455,38 +459,66 @@ msgstr "이메일 주소"
msgid "Fill in an email address to enable password recovery"
msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "언어"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "번역 돕기"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "암호화"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr "암호 변경 시 변경된 사용자 파일을 복구하려면 복구
msgid "Default Storage"
msgstr "기본 저장소"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "무제한"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "기타"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "사용자 이름"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "저장소"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "표시 이름 변경"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "새 암호 설정"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 903dc63b87f59b0b3d65b5425a815f018bf6a84a..1766fef5754c9f90bb3ffc7f69c7cc2fa1d71a4c 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 1948a8cf5eadd0220cf432ca274652a4d584de11..b1c2c88c0ddbaac7d47e57e9d405b6ae7d11e27f 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "دهستكاری"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ههڵه"
@@ -269,9 +293,9 @@ msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "هاوبەشی کردن"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr "بهكارهێنهر"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "بهرنامهكان"
@@ -600,7 +624,7 @@ msgstr "كۆتایی هات دهستكاریهكان"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "چوونەدەرەوە"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index b209e07c6f9551b855cd58dcd45781ae294fcda4..99b5793ea0de4e1da8fb6d8507fd60834df960f3 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -111,13 +111,13 @@ msgstr "ناونیشانی بهستهر نابێت بهتاڵ بێت."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "ههڵه"
#: js/fileactions.js:116
msgid "Share"
-msgstr ""
+msgstr "هاوبەشی کردن"
#: js/fileactions.js:126
msgid "Delete permanently"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "ناو"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr ""
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "داگرتن"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 83b88021ea2ed7aec7202bc1fb3faefacd629e34..d1abf7c6c827036a9720f1f75089a31cfe0e0a7e 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s دابهشی کردووه بوخچهی %s لهگهڵ
msgid "%s shared the file %s with you"
msgstr "%s دابهشی کردووه پهڕگهیی %s لهگهڵ تۆ"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "داگرتن"
@@ -75,6 +75,6 @@ msgstr "بارکردن"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "هیچ پێشبینیهك ئاماده نیه بۆ"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 06a8f2c010f49870717a1a69eee55dc5b602e87d..448dd823748fccc416069916bea3c6933d103969 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "بهكارهێنهر"
msgid "Admin"
msgstr "بهڕێوهبهری سهرهكی"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "ڕاژهی وێب لهژێر چاودێریت دایه"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 943ca690406b46cf4fdea4583e875a9fa9578bba..e9b1bff8adc36e1f79abcf9c4f0e3b1a33380831 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "داواکارى نادروستە"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "چالاککردن"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ههڵه"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "نوێکردنهوه"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "پاشکهوتدهکات..."
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -438,7 +442,7 @@ msgstr "وشەی نهێنی نوێ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ناوی بهکارهێنهر"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index c2ca53a1932263f426c9818cde00569e1bd0552d..724271784b6a2b65a4180ae91ca5e67d12c4e56d 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 73f9dacaf60747b6ae16bd7fb44af8a23a2caf4e..d3769f82671d0029f7e4e5635dd5519978ae55ac 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Keng Kategorien ausgewielt fir ze läschen."
msgid "Error removing %s from favorites."
msgstr "Feeler beim läsche vun %s aus de Favoritten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonndeg"
@@ -167,59 +187,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "haut"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "Joren hir"
@@ -227,22 +247,26 @@ msgstr "Joren hir"
msgid "Choose"
msgstr "Auswielen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr "Den Typ vum Object ass net uginn."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Feeler"
@@ -272,7 +296,7 @@ msgstr "Gedeelt"
msgid "Share"
msgstr "Deelen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
@@ -328,67 +352,67 @@ msgstr "Verfallsdatum setzen"
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "läschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deelen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email geschéckt"
@@ -403,7 +427,7 @@ msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr "Perséinlech"
msgid "Users"
msgstr "Benotzer"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applikatiounen"
@@ -601,7 +625,7 @@ msgstr "Installatioun ofschléissen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Ofmellen"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 02542786a659e1da2fe990affaf270c742c8457e..94e9d242643f8a6aa15c6138d6909da7a497c875 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Fehler"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "ofbriechen"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "réckgängeg man"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Numm"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Geännert"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Hei ass näischt. Lued eppes rop!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Download"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Net méi deelen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Läschen"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Upload ze grouss"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Fichieren gi gescannt, war weg."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Momentane Scan"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index caaaa536d104a5eb16e41ff09e4beedeec08dc55..3fba12cda24d0874476dbd6fc9d3064c9081beac 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s huet den Dossier %s mad der gedeelt"
msgid "%s shared the file %s with you"
msgstr "%s deelt den Fichier %s mad dir"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr "Eroplueden"
msgid "Cancel upload"
msgstr "Upload ofbriechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Keeng Preview do fir"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index e8a02a77cbbeb6184d511ce08966e70e4ec8ed75..bd8ee7af792695e0393d0cb5e424e9c43658ca9f 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Benotzer"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Servicer ënnert denger Kontroll"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "haut"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "gëschter"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Läschte Mount"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Läscht Joer"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Joren hier"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 195b886e8d6d4a5102f158b0a029c76218cbb5ef..7f406ee863e4883686ba0763d53fc4f8deacdefd 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Ofschalten"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aschalten"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Speicheren..."
@@ -149,16 +153,16 @@ msgstr "réckgängeg man"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Läschen"
@@ -178,7 +182,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +348,11 @@ msgstr "Méi"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwuert"
@@ -439,7 +443,7 @@ msgstr "Neit Passwuert"
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -455,38 +459,66 @@ msgstr "Deng Email Adress"
msgid "Fill in an email address to enable password recovery"
msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprooch"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Aner"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benotzernumm"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 291529dde43de73da6eb3ff9799ea2e34d4078ba..5b73ccc321a130a4dfe2946f85b605d22d22383b 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 6f77486ddf4880b0a456e776f5e7155e4623bb6c..23fb315c5196eb633d3f251b0561ccbff5ae4d89 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# mambuta <vspyshkin@gmail.com>, 2013
# Roman Deniobe <rms200x@gmail.com>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -31,28 +32,28 @@ msgstr "grupė"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Įjungta priežiūros veiksena"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Išjungta priežiūros veiksena"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Atnaujinta duomenų bazė"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Atnaujinta failų talpykla"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% atlikta ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -93,6 +94,26 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
msgid "Error removing %s from favorites."
msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sekmadienis"
@@ -169,63 +190,63 @@ msgstr "Lapkritis"
msgid "December"
msgstr "Gruodis"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " prieš %n minutę"
msgstr[1] " prieš %n minučių"
msgstr[2] " prieš %n minučių"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "prieš %n valandą"
msgstr[1] "prieš %n valandų"
msgstr[2] "prieš %n valandų"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "šiandien"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "prieš %n dieną"
+msgstr[1] "prieš %n dienas"
+msgstr[2] "prieš %n dienų"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "prieš %n mėnesį"
msgstr[1] "prieš %n mėnesius"
msgstr[2] "prieš %n mėnesių"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "prieš metus"
@@ -233,22 +254,26 @@ msgstr "prieš metus"
msgid "Choose"
msgstr "Pasirinkite"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Klaida pakraunant failų naršyklę"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Gerai"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -258,7 +283,7 @@ msgstr "Objekto tipas nenurodytas."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Klaida"
@@ -278,7 +303,7 @@ msgstr "Dalinamasi"
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
@@ -316,7 +341,7 @@ msgstr "Slaptažodis"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Leisti viešą įkėlimą"
#: js/share.js:202
msgid "Email link to person"
@@ -334,67 +359,67 @@ msgstr "Nustatykite galiojimo laiką"
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "sukurti"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dalintis"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laiką"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laiką"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Siunčiama..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Laiškas išsiųstas"
@@ -409,7 +434,7 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s slaptažodžio atnaujinimas"
@@ -444,7 +469,7 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
@@ -478,7 +503,7 @@ msgstr "Asmeniniai"
msgid "Users"
msgstr "Vartotojai"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programos"
@@ -507,7 +532,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -529,7 +554,7 @@ msgstr "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Prašome atnaujinti savo PHP, kad saugiai naudoti %s."
#: templates/installation.php:32
msgid ""
@@ -554,7 +579,7 @@ msgstr "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess fai
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -607,7 +632,7 @@ msgstr "Baigti diegimą"
msgid "%s is available. Get more information on how to update."
msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Atsijungti"
@@ -646,7 +671,7 @@ msgstr "Alternatyvūs prisijungimai"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>Linkėjimai!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index af72860fc58b5b4e84bf570f97c15b79ef963e0d..13c09972ea52edca46f56d4602c1b73bd59ec2c2 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,11 +31,11 @@ msgstr "Nepavyko perkelti %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nepavyksta nustatyti įkėlimų katalogo."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Netinkamas ženklas"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -159,27 +160,27 @@ msgstr "anuliuoti"
#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n aplankas"
+msgstr[1] "%n aplankai"
+msgstr[2] "%n aplankų"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n failas"
+msgstr[1] "%n failai"
+msgstr[2] "%n failų"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} ir {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Įkeliamas %n failas"
+msgstr[1] "Įkeliami %n failai"
+msgstr[2] "Įkeliama %n failų"
#: js/filelist.js:628
msgid "files uploading"
@@ -211,7 +212,7 @@ msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus."
#: js/files.js:245
msgid ""
@@ -234,7 +235,7 @@ msgstr "Pakeista"
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s negali būti pervadintas"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index b8b075046ac2945d2834950b06bbccc1ccdb488f..b37c78e711c2985e0fddd0e7980a75d02ac03bff 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-13 08:20+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,13 +47,13 @@ msgstr "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas
#: ajax/updatePrivateKeyPassword.php:51
msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Privataus rakto slaptažodis buvo sėkmingai atnaujintas."
#: ajax/updatePrivateKeyPassword.php:53
msgid ""
"Could not update the private key password. Maybe the old password was not "
"correct."
-msgstr ""
+msgstr "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis."
#: files/error.php:7
msgid ""
@@ -60,22 +61,22 @@ msgid ""
"ownCloud system (e.g. your corporate directory). You can update your private"
" key password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
-msgstr ""
+msgstr "Trūkstami laukai."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
-msgstr ""
+msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Sekantys naudotojai nenustatyti šifravimui:"
#: js/settings-admin.js:11
msgid "Saving..."
@@ -85,15 +86,15 @@ msgstr "Saugoma..."
msgid ""
"Your private key is not valid! Maybe the your password was changed from "
"outside."
-msgstr ""
+msgstr "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?"
#: templates/invalid_private_key.php:7
msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Galite atrakinti savo privatų raktą savo"
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "asmeniniai nustatymai"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -102,11 +103,11 @@ msgstr "Šifravimas"
#: templates/settings-admin.php:10
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):"
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Išjungta"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Pakeisti atkūrimo rakto slaptažodį:"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Senas atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Naujas atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:53
msgid "Change Password"
@@ -134,43 +135,43 @@ msgstr "Pakeisti slaptažodį"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:"
#: templates/settings-personal.php:14
msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo."
#: templates/settings-personal.php:16
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
-msgstr ""
+msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus."
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Senas prisijungimo slaptažodis"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Dabartinis prisijungimo slaptažodis"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Atnaujinti privataus rakto slaptažodį"
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Įjungti slaptažodžio atkūrimą:"
#: templates/settings-personal.php:47
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
-msgstr ""
+msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
#: templates/settings-personal.php:63
msgid "File recovery settings updated"
-msgstr "Failų atstatymo nustatymai pakeisti"
+msgstr "Failų atkūrimo nustatymai pakeisti"
#: templates/settings-personal.php:64
msgid "Could not update file recovery"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 20ba007ff210d3bbe00ce4e130a57e03bded2e0e..1ce65e7a0668fa03fb58a8d4d13bd9bc07bd3e75 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Netinka slaptažodis: Bandykite dar kartą."
#: templates/authenticate.php:7
msgid "Password"
@@ -32,27 +33,27 @@ msgstr "Išsaugoti"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Atleiskite, panašu, kad nuoroda yra neveiksni."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Galimos priežastys:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "elementas buvo pašalintas"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "baigėsi nuorodos galiojimo laikas"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "dalinimasis yra išjungtas"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
#: templates/public.php:15
#, php-format
@@ -64,7 +65,7 @@ msgstr "%s pasidalino su jumis %s aplanku"
msgid "%s shared the file %s with you"
msgstr "%s pasidalino su jumis %s failu"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Atsisiųsti"
@@ -76,6 +77,6 @@ msgstr "Įkelti"
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Peržiūra nėra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index febfc2f1b015d78dc37da7715d22a538fc576160..5e630911f656927be3a391b532f3e14c188d8081 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 20:30+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,47 +29,47 @@ msgstr "Nepavyko negrįžtamai ištrinti %s"
msgid "Couldn't restore %s"
msgstr "Nepavyko atkurti %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "atkurti"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Klaida"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "failą ištrinti negrįžtamai"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Ištrinti negrįžtamai"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Pavadinimas"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Ištrinti"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n aplankų"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n failų"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "atstatyta"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index d3d119b1c3fd3f7eb575b3660bc9ed79f2a1e367..e7bf83a2ed485d3f78614f41bf3713dbea2dfa57 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 20:00+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,16 +29,16 @@ msgstr "Versijos"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Nepavyko atstatyti {file} į būseną {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Daugiau versijų..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Nėra daugiau versijų"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Atstatyti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 21df78c7b6a8a27fef0e185446248a243d006511..7b189b6247cef2f1b2296002a9fa547be82c5683 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -4,12 +4,14 @@
#
# Translators:
# fizikiukas <fizikiukas@gmail.com>, 2013
+# Liudas <liudas@aksioma.lt>, 2013
+# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 20:00+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Nenurodytas programos pavadinimas"
#: app.php:361
msgid "Help"
@@ -49,9 +51,21 @@ msgstr "Vartotojai"
msgid "Admin"
msgstr "Administravimas"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
+msgstr "Nepavyko pakelti „%s“ versijos."
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
msgstr ""
#: defaults.php:35
@@ -61,7 +75,7 @@ msgstr "jūsų valdomos web paslaugos"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "nepavyksta atverti „%s“"
#: files.php:226
msgid "ZIP download is turned off."
@@ -83,63 +97,63 @@ msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
+msgstr "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus."
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nenurodytas šaltinis diegiant programą"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nenurodytas href diegiant programą iš http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nenurodytas kelias diegiant programą iš vietinio failo"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s tipo archyvai nepalaikomi"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Nepavyko atverti archyvo diegiant programą"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Programa nepateikia info.xml failo"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes turi neleistiną kodą"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Programos aplankas jau egzistuoja"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -168,31 +182,31 @@ msgstr "Paveikslėliai"
#: setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
-msgstr ""
+msgstr "%s įrašykite duombazės naudotojo vardą."
#: setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
-msgstr ""
+msgstr "%s įrašykite duombazės pavadinimą."
#: setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s negalite naudoti taškų duombazės pavadinime"
#: setup/mssql.php:20
#, php-format
msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s"
#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
#: setup/postgresql.php:24 setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi."
#: setup/mysql.php:12
msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis"
#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -201,7 +215,7 @@ msgstr ""
#: setup/postgresql.php:125 setup/postgresql.php:134
#, php-format
msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB klaida: \"%s\""
#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
@@ -209,119 +223,119 @@ msgstr ""
#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Vykdyta komanda buvo: \"%s\""
#: setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL naudotojas '%s'@'localhost' jau egzistuoja."
#: setup/mysql.php:86
msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Pašalinti šį naudotoją iš MySQL"
#: setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL naudotojas '%s'@'%%' jau egzistuoja"
#: setup/mysql.php:92
msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Pašalinti šį naudotoją iš MySQL."
#: setup/oci.php:34
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nepavyko sukurti Oracle ryšio"
#: setup/oci.php:41 setup/oci.php:113
msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis"
#: setup/oci.php:173 setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Vykdyta komanda buvo: \"%s\", name: %s, password: %s"
#: setup/postgresql.php:23 setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis"
#: setup.php:28
msgid "Set an admin username."
-msgstr ""
+msgstr "Nustatyti administratoriaus naudotojo vardą."
#: setup.php:31
msgid "Set an admin password."
-msgstr ""
+msgstr "Nustatyti administratoriaus slaptažodį."
#: setup.php:184
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "prieš sekundę"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] " prieš %n minučių"
+msgstr[0] "prieš %n min."
+msgstr[1] "Prieš % minutes"
+msgstr[2] "Prieš %n minučių"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "prieš %n valandų"
+msgstr[0] "Prieš %n valandą"
+msgstr[1] "Prieš %n valandas"
+msgstr[2] "Prieš %n valandų"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "šiandien"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Prieš %n dieną"
+msgstr[1] "Prieš %n dienas"
+msgstr[2] "Prieš %n dienų"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "praeitą mėnesį"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "prieš %n mėnesių"
+msgstr[0] "Prieš %n mėnesį"
+msgstr[1] "Prieš %n mėnesius"
+msgstr[2] "Prieš %n mėnesių"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "praeitais metais"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "prieš metus"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Iššaukė:"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Nepavyko rasti kategorijos „%s“"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 9f10ee721e5f76593980c3b4453d6e9235cc2c16..ce270478859f9374e60d724a5eed18644485ba32 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -4,12 +4,15 @@
#
# Translators:
# fizikiukas <fizikiukas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
+# Liudas <liudas@aksioma.lt>, 2013
+# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -29,11 +32,11 @@ msgstr "Autentikacijos klaida"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Jūsų rodomas vardas buvo pakeistas."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr ""
+msgstr "Nepavyksta pakeisti rodomą vardą"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -69,7 +72,7 @@ msgstr "Klaidinga užklausa"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratoriai negali pašalinti savęs iš administratorių grupės"
#: ajax/togglegroups.php:30
#, php-format
@@ -85,55 +88,59 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s"
msgid "Couldn't update app."
msgstr "Nepavyko atnaujinti programos."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atnaujinti iki {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Išjungti"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Įjungti"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Prašome palaukti..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Klaida išjungiant programą"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Klaida įjungiant programą"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Atnaujinama..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Įvyko klaida atnaujinant programą"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Klaida"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Atnaujinti"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Atnaujinta"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:217
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
+
+#: js/personal.js:284
msgid "Saving..."
msgstr "Saugoma..."
@@ -149,16 +156,16 @@ msgstr "anuliuoti"
msgid "Unable to remove user"
msgstr "Nepavyko ištrinti vartotojo"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupės"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
-msgstr ""
+msgstr "Grupės administratorius"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ištrinti"
@@ -178,7 +185,7 @@ msgstr "Klaida kuriant vartotoją"
msgid "A valid password must be provided"
msgstr "Slaptažodis turi būti tinkamas"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Kalba"
@@ -193,22 +200,22 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr ""
+msgstr "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Nustatyti perspėjimą"
#: templates/admin.php:32
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -218,11 +225,11 @@ msgstr "Trūksta 'fileinfo' modulio"
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr ""
+msgstr "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą."
#: templates/admin.php:58
msgid "Locale not working"
-msgstr ""
+msgstr "Lokalė neveikia"
#: templates/admin.php:63
#, php-format
@@ -230,11 +237,11 @@ msgid ""
"System locale can't be set to %s. This means that there might be problems "
"with certain characters in file names. We strongly suggest to install the "
"required packages on your system to support %s."
-msgstr ""
+msgstr "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s."
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr ""
+msgstr "Nėra interneto ryšio"
#: templates/admin.php:78
msgid ""
@@ -243,7 +250,7 @@ msgid ""
"installation of 3rd party apps don´t work. Accessing files from remote and "
"sending of notification emails might also not work. We suggest to enable "
"internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas."
#: templates/admin.php:92
msgid "Cron"
@@ -251,17 +258,17 @@ msgstr "Cron"
#: templates/admin.php:99
msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu"
#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę."
#: templates/admin.php:120
msgid "Sharing"
@@ -269,11 +276,11 @@ msgstr "Dalijimasis"
#: templates/admin.php:126
msgid "Enable Share API"
-msgstr ""
+msgstr "Įjungti Share API"
#: templates/admin.php:127
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Leidžia programoms naudoti Share API"
#: templates/admin.php:134
msgid "Allow links"
@@ -281,16 +288,16 @@ msgstr "Lesti nuorodas"
#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Leisti viešus įkėlimus"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -298,15 +305,15 @@ msgstr "Leisti dalintis"
#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
#: templates/admin.php:160
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Leisti naudotojams dalintis su bet kuo"
#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
#: templates/admin.php:170
msgid "Security"
@@ -314,19 +321,19 @@ msgstr "Saugumas"
#: templates/admin.php:183
msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Reikalauti HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Verčia klientus jungtis prie %s per šifruotą ryšį."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą."
#: templates/admin.php:203
msgid "Log"
@@ -344,11 +351,11 @@ msgstr "Daugiau"
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -356,7 +363,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:13
msgid "Add your App"
@@ -372,7 +379,7 @@ msgstr "Pasirinkite programą"
#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Žiūrėti programos puslapį svetainėje apps.owncloud.com"
#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -380,15 +387,15 @@ msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
#: templates/help.php:4
msgid "User Documentation"
-msgstr ""
+msgstr "Naudotojo dokumentacija"
#: templates/help.php:6
msgid "Administrator Documentation"
-msgstr ""
+msgstr "Administratoriaus dokumentacija"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Dokumentacija tinkle"
#: templates/help.php:11
msgid "Forum"
@@ -400,7 +407,7 @@ msgstr "Klaidų sekimas"
#: templates/help.php:17
msgid "Commercial Support"
-msgstr ""
+msgstr "Komercinis palaikymas"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
@@ -408,14 +415,14 @@ msgstr "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Rodyti pirmo karto vedlį dar kartą"
#: templates/personal.php:27
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Slaptažodis"
@@ -439,9 +446,9 @@ msgstr "Naujas slaptažodis"
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
-msgstr ""
+msgstr "Rodyti vardą"
#: templates/personal.php:73
msgid "Email"
@@ -455,40 +462,68 @@ msgstr "Jūsų el. pašto adresas"
msgid "Fill in an email address to enable password recovery"
msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Kalba"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Naudokite šį adresą, kad <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pasiekti savo failus per WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifravimas"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Prisijungimo slaptažodis"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Iššifruoti visus failus"
#: templates/users.php:21
msgid "Login Name"
@@ -500,42 +535,42 @@ msgstr "Sukurti"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administracinis atkūrimo slaptažodis"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį"
#: templates/users.php:42
msgid "Default Storage"
-msgstr ""
+msgstr "Numatytas saugojimas"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neribota"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Kita"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Prisijungimo vardas"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
-msgstr ""
+msgstr "Saugojimas"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
-msgstr ""
+msgstr "keisti rodomą vardą"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nustatyti naują slaptažodį"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Numatytasis"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index af344de49a733f77928ba8bd05920499ac582fc1..5baac49ff31abd327f7d805e80b5105fad2c53c9 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 21:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr ""
#: templates/settings.php:37
msgid "Host"
-msgstr ""
+msgstr "Mazgas"
#: templates/settings.php:39
msgid ""
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 72eda2b521ba3bfa6b9007b232c7778522e49aef..fae87f29dda365612e24a742bbf3da72f4de76bc 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# Min2liz <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-13 08:20+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +21,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "WebDAV autorizavimas"
+msgstr "WebDAV autentikacija"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresas:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 65e8cfde0e4a316943bfdef7ac4864d5a591fa47..a0a14df889d8a1cdf0f46a511306940d82dd1d73 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Neviena kategorija nav izvēlēta dzēšanai."
msgid "Error removing %s from favorites."
msgstr "Kļūda, izņemot %s no izlases."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Svētdiena"
@@ -167,63 +187,63 @@ msgstr "Novembris"
msgid "December"
msgstr "Decembris"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Tagad, %n minūtes"
msgstr[1] "Pirms %n minūtes"
msgstr[2] "Pirms %n minūtēm"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Šodien, %n stundas"
msgstr[1] "Pirms %n stundas"
msgstr[2] "Pirms %n stundām"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "šodien"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Šodien, %n dienas"
msgstr[1] "Pirms %n dienas"
msgstr[2] "Pirms %n dienām"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Šomēnes, %n mēneši"
msgstr[1] "Pirms %n mēneša"
msgstr[2] "Pirms %n mēnešiem"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "gājušajā gadā"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -231,22 +251,26 @@ msgstr "gadus atpakaļ"
msgid "Choose"
msgstr "Izvēlieties"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Kļūda ielādējot datņu ņēmēja veidni"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nē"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Labi"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -256,7 +280,7 @@ msgstr "Nav norādīts objekta tips."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Kļūda"
@@ -276,7 +300,7 @@ msgstr "Kopīgs"
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Kļūda, daloties"
@@ -332,67 +356,67 @@ msgstr "Iestaties termiņa datumu"
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Atkārtota dalīšanās nav atļauta"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Dalījās ar {item} ar {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "izveidot"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "dzēst"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dalīties"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sūta..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Vēstule nosūtīta"
@@ -407,7 +431,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s paroles maiņa"
@@ -476,7 +500,7 @@ msgstr "Personīgi"
msgid "Users"
msgstr "Lietotāji"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Lietotnes"
@@ -605,7 +629,7 @@ msgstr "Pabeigt iestatīšanu"
msgid "%s is available. Get more information on how to update."
msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Izrakstīties"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index ac1b1e7ab6b093a9fea463e1ee55e2f46cd36126..c173b6e331c65ad18a71a1f8c36a79dc9689f422 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 71c4b1fd73fa99649157d83ce04fed405ad8c6aa..036cfaf96077f4a57cf0334080a952f15837c59e 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s ar jums dalījās ar mapi %s"
msgid "%s shared the file %s with you"
msgstr "%s ar jums dalījās ar datni %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lejupielādēt"
@@ -75,6 +75,6 @@ msgstr "Augšupielādēt"
msgid "Cancel upload"
msgstr "Atcelt augšupielādi"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nav pieejams priekšskatījums priekš"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 4e466109777939dd878db0842b98cd8b64927c63..1c2c3f45c586d894490e8f31633837edc9894aca 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Lietotāji"
msgid "Admin"
msgstr "Administratori"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Kļūda atjauninot \"%s\""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "tīmekļa servisi tavā varā"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,55 +277,55 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n minūtēm"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n stundām"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "šodien"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n dienām"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n mēnešiem"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "gājušajā gadā"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "gadus atpakaļ"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index d3122ddf8608fd4cc29a9e763d6173cbec1ed9f6..f04b2af573eeed30fbc74898a97e318e758b9406 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "Nevar izņemt lietotāju no grupas %s"
msgid "Couldn't update app."
msgstr "Nevarēja atjaunināt lietotni."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atjaunināt uz {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivēt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivēt"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Lūdzu, uzgaidiet...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Atjaunina...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Kļūda, atjauninot lietotni"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Kļūda"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Atjaunināt"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Atjaunināta"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Saglabā..."
@@ -149,16 +153,16 @@ msgstr "atsaukt"
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotāju"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Dzēst"
@@ -178,7 +182,7 @@ msgstr "Kļūda, veidojot lietotāju"
msgid "A valid password must be provided"
msgstr "Jānorāda derīga parole"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
@@ -344,11 +348,11 @@ msgstr "Vairāk"
msgid "Less"
msgstr "Mazāk"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parole"
@@ -439,7 +443,7 @@ msgstr "Jauna parole"
msgid "Change password"
msgstr "Mainīt paroli"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Redzamais vārds"
@@ -455,38 +459,66 @@ msgstr "Jūsu e-pasta adrese"
msgid "Fill in an email address to enable password recovery"
msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Valoda"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrēšana"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Šifrēšanas lietotne ir atslēgta, atšifrējiet visus jūsu failus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Pieslēgšanās parole"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Atšifrēt visus failus"
@@ -512,30 +544,30 @@ msgstr "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus parole
msgid "Default Storage"
msgstr "Noklusējuma krātuve"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neierobežota"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Cits"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Lietotājvārds"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Krātuve"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "mainīt redzamo vārdu"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "iestatīt jaunu paroli"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3811f911bae52fbaf906358a351dc8fe314abc8b..cd344fb96ce1897a2f729dfac40bc39a4ee5b75b 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index a426e2ec182ba66fc79310d17f6b7720d9cfb000..4adcd52cb6cd3e8c42a868704851c6769b0767f7 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Не е одбрана категорија за бришење."
msgid "Error removing %s from favorites."
msgstr "Грешка при бришење на %s од омилени."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Недела"
@@ -166,59 +186,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Подесувања"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "пред секунди"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "денеска"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "минатиот месец"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "пред месеци"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "минатата година"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "пред години"
@@ -226,22 +246,26 @@ msgstr "пред години"
msgid "Choose"
msgstr "Избери"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Во ред"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr "Не е специфициран типот на објект."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "Сподели"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Грешка при споделување"
@@ -327,67 +351,67 @@ msgstr "Постави рок на траење"
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Не се најдени луѓе"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Повторно споделување не е дозволено"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} со {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Не споделувај"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "креирај"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ажурирај"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "избриши"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "сподели"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Заштитено со лозинка"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Грешка при поставување на рок на траење"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Е-порака пратена"
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "Лично"
msgid "Users"
msgstr "Корисници"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Аппликации"
@@ -600,7 +624,7 @@ msgstr "Заврши го подесувањето"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 19942eb2ca5719d8722ee95e10090976e915eed0..3d0602225b04da07352a44f5638b2a191c8c0006 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr "Адресата неможе да биде празна."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Грешка"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} веќе постои"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "замени"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "предложи име"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr "заменета {new_name} со {old_name}"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "врати"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Име"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Големина"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Променето"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Не споделувај"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Избриши"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Фајлот кој се вчитува е преголем"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Се скенираат датотеки, ве молам почекајте."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index f669e2ffd241caf9af8a7f797b25bc9cea4fe38a..97b8547bc7789e10c89222e301cf07184b249cf9 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s ја сподели папката %s со Вас"
msgid "%s shared the file %s with you"
msgstr "%s ја сподели датотеката %s со Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Преземи"
@@ -75,6 +75,6 @@ msgstr "Подигни"
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Нема достапно преглед за"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 9ea277ce4a99b4c545573c5c4f1d7c7e1f981b10..f87e0ecc9071ea5fe12c9cadce5cbde2e11881da 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Корисници"
msgid "Admin"
msgstr "Админ"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "веб сервиси под Ваша контрола"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "пред секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "денеска"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "минатиот месец"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "минатата година"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "пред години"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index f607774bbaf7f396750b9c386c9a8791f7e79a1f..38fa0d44ed1f67a2e01e7cd375be6cb2c6b28daf 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Неможе да избришам корисник од група %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Оневозможи"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Овозможи"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ажурирај"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Снимам..."
@@ -148,16 +152,16 @@ msgstr "врати"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Групи"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Администратор на група"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Избриши"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Повеќе"
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Лозинка"
@@ -438,7 +442,7 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Вашата адреса за е-пошта"
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Јазик"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Останато"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Корисничко име"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 323404d636423ebc55dc05450a5490f78c89f264..c1df01027fb0a3b75f8e56a27b94606b60906daa 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 1e8a07eb01db3903e3fe7b10adafd01b25098e94..18bc15e9ed70fea5de8bcebe4af616ee2c63a531 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 98bbc764f021005e5379c07976df6283c7c4c3c1..0068185b81e2ac331ee193593129c30cf970c26e 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 67536fd94e77ba7510481852cfe8d2403d6487b3..860543d098407525ea63869661d24681852a45f9 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 0e3255b6ebe0decb84d04dbe4e9e99c5d11ded9e..18895df227efd53a93ec9a9eb2098c671eed5478 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Tiada kategori dipilih untuk dibuang."
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Ahad"
@@ -166,55 +186,55 @@ msgstr "November"
msgid "December"
msgstr "Disember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -222,22 +242,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Ralat"
@@ -267,7 +291,7 @@ msgstr ""
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +347,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "Peribadi"
msgid "Users"
msgstr "Pengguna"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikasi"
@@ -596,7 +620,7 @@ msgstr "Setup selesai"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Log keluar"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index ce73924876576de6526a970dbf710b0fcac5c2a5..27f7519e9d30467fb6598da63fa59767e24fe0f1 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Ralat"
@@ -127,54 +127,54 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Dalam proses"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "Batal"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -212,15 +212,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Nama"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Saiz"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Dimodifikasi"
@@ -297,33 +297,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Muat turun"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Padam"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Muatnaik terlalu besar"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Fail sedang diimbas, harap bersabar."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Imbasan semasa"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 7ce6237f3d070617aa3a4c32c84dd6da0cafe90c..67cf9aabfb3743efa0add93d65eeb3fe58b557ff 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Muat turun"
@@ -75,6 +75,6 @@ msgstr "Muat naik"
msgid "Cancel upload"
msgstr "Batal muat naik"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 637bea9f33c1a1fdb790dad6c2bebdb21234a7b5..2d0d010262befec2b7ad3b17b447dca4240ace9d 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Pengguna"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Perkhidmatan web di bawah kawalan anda"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index f809ae9063263d4c29b59cf3db750dcfc4a29e62..96dcca28a937981dc45727293ca3b07a0763ba85 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Nyahaktif"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktif"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Ralat"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Kemaskini"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Simpan..."
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Padam"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_nama_bahasa_"
@@ -343,11 +347,11 @@ msgstr "Lanjutan"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kata laluan"
@@ -438,7 +442,7 @@ msgstr "Kata laluan baru"
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Alamat emel anda"
msgid "Fill in an email address to enable password recovery"
msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Lain"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nama pengguna"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index de6d8fa0134ec750e153958307ea7e249c435c11..403d5ac2ff3d13b628d0ea8a1fd898579716f1df 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 4a7e283b44cae2e51d81c2b2f45a88e479461c03..3732fcec7ab13548006f154efb390c9b047198fc 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွ
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,55 +186,55 @@ msgstr "နိုဝင်ဘာ"
msgid "December"
msgstr "ဒီဇင်ဘာ"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -222,22 +242,26 @@ msgstr "နှစ် အရင်က"
msgid "Choose"
msgstr "ရွေးချယ်"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "မဟုတ်ဘူး"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "အိုကေ"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +291,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +347,67 @@ msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ
msgid "Expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ဝေမျှမည်"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr ""
msgid "Users"
msgstr "သုံးစွဲသူ"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -596,7 +620,7 @@ msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 77d34ee18f778b258671b7042f0eb4a8301b6929..6b5c6c97692d1e1f957f0a504b975f4e0d986b4f 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ဒေါင်းလုတ်"
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 4e6fa87d98938749b4184775fc042632a1298985..a5faefbbddf071d487dead4ccb4c9a06e33a0f59 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "သုံးစွဲသူ"
msgid "Admin"
msgstr "အက်ဒမင်"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ယနေ့"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "မနေ့က"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "မနှစ်က"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "နှစ် အရင်က"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 94670f111b4e310d355e16fe96365604037c9706..985e6ce0a42179df73f5d043619aaaa387c37b38 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "စကားဝှက်"
@@ -438,7 +442,7 @@ msgstr "စကားဝှက်အသစ်"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "သုံးစွဲသူအမည်"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 62ed04aa882661d73232e77db87b58d6982b3853..cb30d0ff0f7fa010808b254c25917dc45478a7c9 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 68b8f11bed353de2383a330f68a64ee1f3364ea9..74f64d6762bffe14a4d48bad8450e06ad27a0044 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Ingen kategorier merket for sletting."
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Søndag"
@@ -167,59 +187,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "forrige år"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "år siden"
@@ -227,22 +247,26 @@ msgstr "år siden"
msgid "Choose"
msgstr "Velg"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Feil"
@@ -272,7 +296,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Feil under deling"
@@ -328,67 +352,67 @@ msgstr "Set utløpsdato"
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "opprett"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "oppdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slett"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-post sendt"
@@ -403,7 +427,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr "Personlig"
msgid "Users"
msgstr "Brukere"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apper"
@@ -601,7 +625,7 @@ msgstr "Fullfør oppsetting"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logg ut"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 21093f1c7e0a1b1440b2a63482aa1a415ae319d9..318d4d445a5a3db5c2c175c5cf5d77f942323136 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index ccc3611f7268dd24a1973687b8056140f00fbad0..02cbd3e982f2892ff3ce1e5fde75910ce3f7fdac 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med deg"
msgid "%s shared the file %s with you"
msgstr "%s delte filen %s med deg"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Last ned"
@@ -76,6 +76,6 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Forhåndsvisning ikke tilgjengelig for"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1341b39baedf541b2450afd60ad5a7031c95ee4d..1fa0543983ba9b71d433a2df5ac59447b510d2d9 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Brukere"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "web tjenester du kontrollerer"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder siden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "forrige måned"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "forrige år"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 98c0ccd925010b8dbeb7bc7158bcfc26b7537e7c..ff63353afc02c682183f34d0429a4f86ebe627c2 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +86,59 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke oppdatere app."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Oppdater til {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Slå avBehandle "
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktiver"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Vennligst vent..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Oppdaterer..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Feil ved oppdatering av app"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Feil"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Oppdater"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Lagrer..."
@@ -150,16 +154,16 @@ msgstr "angre"
msgid "Unable to remove user"
msgstr "Kunne ikke slette bruker"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slett"
@@ -179,7 +183,7 @@ msgstr "Feil ved oppretting av bruker"
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -345,11 +349,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passord"
@@ -440,7 +444,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visningsnavn"
@@ -456,38 +460,66 @@ msgstr "Din e-postadresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +545,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Standard lager"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrenset"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annet"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brukernavn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lager"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "endre visningsnavn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "sett nytt passord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 037b92065940ed5532aba8ce7d3f8a7b78fd936e..52aa1d44d42d2cc0323aec63e1ab4c58a7c87b72 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 5183d028931403d8c5a49c86cc97ec14917d1d2b..10549b66bad487def45d04010caf80c80d8748c9 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index a938ce906cd21599ec456299e3166ceeea72d21e..a45524a68a8677f52883446785d8e65dc5236f99 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 95b359633edb8c3d9c2ca0e2c551ec260dcf962c..c3ea7fab118786b73a967e5ba07e412b557d8318 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index c7b2e1c117b8997ee899234e4de13837b63743c5..5212bcfb804725d95d0e8c0fbd8933d414b5b6d7 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -93,6 +93,26 @@ msgstr "Geen categorie geselecteerd voor verwijdering."
msgid "Error removing %s from favorites."
msgstr "Verwijderen %s van favorieten is mislukt."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "zondag"
@@ -169,59 +189,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "vandaag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "jaar geleden"
@@ -229,22 +249,26 @@ msgstr "jaar geleden"
msgid "Choose"
msgstr "Kies"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fout bij laden van bestandsselectie sjabloon"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -254,7 +278,7 @@ msgstr "Het object type is niet gespecificeerd."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fout"
@@ -274,7 +298,7 @@ msgstr "Gedeeld"
msgid "Share"
msgstr "Delen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
@@ -330,67 +354,67 @@ msgstr "Stel vervaldatum in"
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creëer"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "bijwerken"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deel"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de verval datum"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail verzonden"
@@ -405,7 +429,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s wachtwoord reset"
@@ -474,7 +498,7 @@ msgstr "Persoonlijk"
msgid "Users"
msgstr "Gebruikers"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -603,7 +627,7 @@ msgstr "Installatie afronden"
msgid "%s is available. Get more information on how to update."
msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Afmelden"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index c42cf442efebabec7e2ac951106b888de4caf144..e8546df4ad2db31a45b1f77bb325fdfbebd74abf 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+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"
@@ -171,7 +171,7 @@ msgstr[1] "%n bestanden"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} en {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index a9f681aaee2ce036889178f1b40335ef6e1c8757..1acf14b32977ee1b5c727e6178c24a9d4cbc19c2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Len <lenny@weijl.org>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s deelt de map %s met u"
msgid "%s shared the file %s with you"
msgstr "%s deelt het bestand %s met u"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Downloaden"
@@ -77,6 +77,6 @@ msgstr "Uploaden"
msgid "Cancel upload"
msgstr "Upload afbreken"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Geen voorbeeldweergave beschikbaar voor"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 08fe305989ff5ca5e8e87acabfa3bd45a7e84368..2c3f2413cdba5a5906c5cf43fd249cf4785e8714 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:30+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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,11 +51,23 @@ msgstr "Gebruikers"
msgid "Admin"
msgstr "Beheerder"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgrade \"%s\" mislukt."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
@@ -108,37 +120,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -267,51 +279,51 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "seconden geleden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuut geleden"
msgstr[1] "%n minuten geleden"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n uur geleden"
msgstr[1] "%n uur geleden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "vandaag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "gisteren"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag terug"
msgstr[1] "%n dagen geleden"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "vorige maand"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n maand geleden"
msgstr[1] "%n maanden geleden"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "vorig jaar"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "jaar geleden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index fef0b93014e54be6d7af25a51d9fa11f575767ff..96f0a92125ed17c32344b45cd05359ed9f49eaef 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:30+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -88,55 +88,59 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
msgid "Couldn't update app."
msgstr "Kon de app niet bijwerken."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Bijwerken naar {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Uitschakelen"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activeer"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Even geduld aub...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Fout tijdens het uitzetten van het programma"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Fout tijdens het aanzetten van het programma"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Bijwerken...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Fout bij bijwerken app"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fout"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Bijwerken"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Opslaan"
@@ -152,16 +156,16 @@ msgstr "ongedaan maken"
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Verwijder"
@@ -181,7 +185,7 @@ msgstr "Fout bij aanmaken gebruiker"
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Nederlands"
@@ -347,11 +351,11 @@ msgstr "Meer"
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "Toon de Eerste start Wizard opnieuw"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Wachtwoord"
@@ -442,7 +446,7 @@ msgstr "Nieuw"
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Weergavenaam"
@@ -458,38 +462,66 @@ msgstr "Uw e-mailadres"
msgid "Fill in an email address to enable password recovery"
msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Taal"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "De encryptie-appplicatie is niet meer aanwezig, decodeer al uw bestanden"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Inlog-wachtwoord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decodeer alle bestanden"
@@ -515,30 +547,30 @@ msgstr "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen
msgid "Default Storage"
msgstr "Standaard Opslaglimiet"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ongelimiteerd"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Anders"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Gebruikersnaam"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Opslaglimiet"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "wijzig weergavenaam"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Instellen nieuw wachtwoord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standaard"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 61ed6bb4d8406466a9dbf790307d68b2f1292b45..b0ecf57ce45f48850b95ba9f1e47a7b24f365e63 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-23 20:16-0400\n"
-"PO-Revision-Date: 2013-08-23 16:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 8772791ae01d9749ebdc198673e3d8a44d91ab05..87a27da4b851c0367f9b2cf410b0723988b1cfb1 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -5,12 +5,13 @@
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s delte «%s» med deg"
#: ajax/share.php:227
msgid "group"
@@ -30,28 +31,28 @@ msgstr "gruppe"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Skrudde på vedlikehaldsmodus"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Skrudde av vedlikehaldsmodus"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database oppdatert"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Oppdaterer mellomlager; dette kan ta ei god stund …"
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Mellomlager oppdatert"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "… %d %% ferdig …"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +93,26 @@ msgstr "Ingen kategoriar valt for sletting."
msgid "Error removing %s from favorites."
msgstr "Klarte ikkje fjerna %s frå favorittar."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Søndag"
@@ -168,59 +189,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minutt sidan"
+msgstr[1] "%n minutt sidan"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n time sidan"
+msgstr[1] "%n timar sidan"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dag sidan"
+msgstr[1] "%n dagar sidan"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "førre månad"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n månad sidan"
+msgstr[1] "%n månadar sidan"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "i fjor"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "år sidan"
@@ -228,22 +249,26 @@ msgstr "år sidan"
msgid "Choose"
msgstr "Vel"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Greitt"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +278,7 @@ msgstr "Objekttypen er ikkje spesifisert."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Feil"
@@ -273,7 +298,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Feil ved deling"
@@ -311,7 +336,7 @@ msgstr "Passord"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Tillat offentleg opplasting"
#: js/share.js:202
msgid "Email link to person"
@@ -329,67 +354,67 @@ msgstr "Set utløpsdato"
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "lag"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "oppdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slett"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-post sendt"
@@ -404,10 +429,10 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s passordnullstilling"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -439,11 +464,11 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, eg vil nullstilla passordet mitt no"
#: lostpassword/templates/lostpassword.php:27
msgid "Request reset"
@@ -473,7 +498,7 @@ msgstr "Personleg"
msgid "Users"
msgstr "Brukarar"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Program"
@@ -502,7 +527,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -524,7 +549,7 @@ msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt."
#: templates/installation.php:32
msgid ""
@@ -549,7 +574,7 @@ msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett s
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -602,7 +627,7 @@ msgstr "Fullfør oppsettet"
msgid "%s is available. Get more information on how to update."
msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logg ut"
@@ -641,7 +666,7 @@ msgstr "Alternative innloggingar"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<"
#: templates/update.php:3
#, php-format
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 623cceba50cbed91f6aa9ba291b46fe50d5f55b4..049246c47e1bfe1bd5f128b0f5d6bdf110382b19 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +31,11 @@ msgstr "Klarte ikkje flytta %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Klarte ikkje å endra opplastingsmappa."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig token"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -160,24 +160,24 @@ msgstr "angre"
#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} og {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lastar opp %n fil"
+msgstr[1] "Lastar opp %n filer"
#: js/filelist.js:628
msgid "files uploading"
@@ -209,7 +209,7 @@ msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
#: js/files.js:245
msgid ""
@@ -232,7 +232,7 @@ msgstr "Endra"
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "Klarte ikkje å omdøypa på %s"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index f1295711ff8aa1c023811d6ac517b366a8c6ca9b..112217447c87552c888cd3a5adeb78cbd45de0bc 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"POT-Creation-Date: 2013-09-08 21:36-0400\n"
+"PO-Revision-Date: 2013-09-08 17:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
#: templates/settings-admin.php:10
msgid ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 53090ff185e5f6312ee952ab8d76333f403b34b7..4b5c1c4d3ae512c9a1542fd9f732e2b8adadc072 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Passordet er gale. Prøv igjen."
#: templates/authenticate.php:7
msgid "Password"
@@ -32,27 +32,27 @@ msgstr "Send"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Orsak, denne lenkja fungerer visst ikkje lenger."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Moglege grunnar:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "fila/mappa er fjerna"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "lenkja har gått ut på dato"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "deling er slått av"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
#: templates/public.php:15
#, php-format
@@ -64,7 +64,7 @@ msgstr "%s delte mappa %s med deg"
msgid "%s shared the file %s with you"
msgstr "%s delte fila %s med deg"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Last ned"
@@ -76,6 +76,6 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Inga førehandsvising tilgjengeleg for"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index c10ee6cd50721a6edd112bfa9c773292c32beedd..8a6b4412c287fe2a80138134d039772a6627badf 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-08 21:36-0400\n"
+"PO-Revision-Date: 2013-09-08 15:20+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +29,45 @@ msgstr "Klarte ikkje sletta %s for godt"
msgid "Couldn't restore %s"
msgstr "Klarte ikkje gjenoppretta %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "utfør gjenoppretting"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Feil"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "slett fila for godt"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Sletta"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "gjenoppretta"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index a6e633a4c28456595ec253f4c497cb459384e5a0..bb94b8df8e78148f5f47f86b22d2a0a4c1aa1a1e 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 07:50+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,16 +29,16 @@ msgstr "Utgåver"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Fleire utgåver …"
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Ingen andre utgåver tilgjengeleg"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Gjenopprett"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 5829746af2992452568e5dc1a30d593053cb4ea0..dd499893e3ce6a6d369f8c04a54547ba5616015d 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -4,12 +4,13 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +50,23 @@ msgstr "Brukarar"
msgid "Admin"
msgstr "Administrer"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Vev tjenester under din kontroll"
@@ -106,37 +119,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -263,53 +276,53 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekund sidan"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minutt sidan"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n timar sidan"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dagar sidan"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "førre månad"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n månadar sidan"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "i fjor"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år sidan"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f46da15c6e295971207d988140ba24ad002db597..50ceb17f76cfe8968c9b36846adca139df3759db 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -5,12 +5,13 @@
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +87,59 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
msgid "Couldn't update app."
msgstr "Klarte ikkje oppdatera programmet."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Oppdater til {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Slå av"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Slå på"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Ver venleg og vent …"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Klarte ikkje å skru av programmet"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Klarte ikkje å skru på programmet"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Oppdaterer …"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Feil ved oppdatering av app"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Feil"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Oppdater"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:217
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
+
+#: js/personal.js:284
msgid "Saving..."
msgstr "Lagrar …"
@@ -150,16 +155,16 @@ msgstr "angra"
msgid "Unable to remove user"
msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppestyrar"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slett"
@@ -179,7 +184,7 @@ msgstr "Feil ved oppretting av brukar"
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Nynorsk"
@@ -194,7 +199,7 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr ""
+msgstr "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -209,7 +214,7 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -231,7 +236,7 @@ msgid ""
"System locale can't be set to %s. This means that there might be problems "
"with certain characters in file names. We strongly suggest to install the "
"required packages on your system to support %s."
-msgstr ""
+msgstr "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +249,7 @@ msgid ""
"installation of 3rd party apps don´t work. Accessing files from remote and "
"sending of notification emails might also not work. We suggest to enable "
"internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +263,11 @@ msgstr "Utfør éi oppgåve for kvar sidelasting"
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet."
#: templates/admin.php:120
msgid "Sharing"
@@ -286,12 +291,12 @@ msgstr "La brukarar dela ting offentleg med lenkjer"
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Tillat offentlege opplastingar"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -320,14 +325,14 @@ msgstr "Krev HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +350,11 @@ msgstr "Meir"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Utgåve"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +421,7 @@ msgstr "Vis Oppstartvegvisaren igjen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passord"
@@ -440,7 +445,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visingsnamn"
@@ -456,40 +461,68 @@ msgstr "Di epost-adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjelp oss å omsetja"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Innloggingspassord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Dekrypter alle filene"
#: templates/users.php:21
msgid "Login Name"
@@ -501,42 +534,42 @@ msgstr "Lag"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Gjenopprettingspassord for administrator"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring"
#: templates/users.php:42
msgid "Default Storage"
msgstr "Standardlagring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrensa"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Anna"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brukarnamn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "endra visingsnamn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "lag nytt passord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 8ded31122dfd0a4a11a66f81a6f3787a68252ef1..50449bc4e8a30951e13437bfd08046a16e778b7b 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 09:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr ""
#: templates/settings.php:37
msgid "Host"
-msgstr ""
+msgstr "Tenar"
#: templates/settings.php:39
msgid ""
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 05d3c32b03d66dd889d700e02ee579bde2bfeed8..59e481b97fdc248e5297420da7553127204ce40a 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 07:50+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,11 @@ msgstr "WebDAV-autentisering"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresse:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. This plugin checks the "
"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
"credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..27d872844d4509524b55e71f69e1fffba83745de
--- /dev/null
+++ b/l10n/nqo/core.po
@@ -0,0 +1,667 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:387
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:853
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:854
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: js/js.js:855
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: js/js.js:856
+msgid "today"
+msgstr ""
+
+#: js/js.js:857
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:858
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: js/js.js:859
+msgid "last month"
+msgstr ""
+
+#: js/js.js:860
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: js/js.js:861
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:862
+msgid "last year"
+msgstr ""
+
+#: js/js.js:863
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:645 js/share.js:657
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:131 js/share.js:685
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr ""
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:245
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:352
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:354
+msgid "access control"
+msgstr ""
+
+#: js/share.js:357
+msgid "create"
+msgstr ""
+
+#: js/share.js:360
+msgid "update"
+msgstr ""
+
+#: js/share.js:363
+msgid "delete"
+msgstr ""
+
+#: js/share.js:366
+msgid "share"
+msgstr ""
+
+#: js/share.js:400 js/share.js:632
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:645
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:657
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:672
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:683
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:37
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..ee3f40afbc436a32e6c98b66bae1ff95e2425adb
--- /dev/null
+++ b/l10n/nqo/files.po
@@ -0,0 +1,332 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Upload failed"
+msgstr ""
+
+#: ajax/upload.php:127
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:165
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:239
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:244 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:192
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:307
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:307 js/filelist.js:309
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:354
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:432
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:563
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: js/filelist.js:628
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:563 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:564 templates/index.php:81
+msgid "Size"
+msgstr ""
+
+#: js/files.js:565 templates/index.php:83
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:88 templates/index.php:89
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:94 templates/index.php:95
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:108
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:110
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:118
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..3c4beade2a4c3182f51467bb7a6f299dedb8c806
--- /dev/null
+++ b/l10n/nqo/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:250
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..bb48f60af6ea4327cb75177d70fcb3c747714a64
--- /dev/null
+++ b/l10n/nqo/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:457
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c548248cff1854e126126c5949f1ba6b35eb95e
--- /dev/null
+++ b/l10n/nqo/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c737c0b7573e81407e187aab8e6a7a82aca9d96
--- /dev/null
+++ b/l10n/nqo/files_trashbin.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/nqo/files_versions.po b/l10n/nqo/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..2ced8c6105d5ae7ae0460ab76006088a28ae22d6
--- /dev/null
+++ b/l10n/nqo/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..6f2612e081723bed36702f55ac278f6739fc5a63
--- /dev/null
+++ b/l10n/nqo/lib.po
@@ -0,0 +1,330 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
+msgid "Help"
+msgstr ""
+
+#: app.php:374
+msgid "Personal"
+msgstr ""
+
+#: app.php:385
+msgid "Settings"
+msgstr ""
+
+#: app.php:397
+msgid "Users"
+msgstr ""
+
+#: app.php:410
+msgid "Admin"
+msgstr ""
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr ""
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: template/functions.php:99
+msgid "today"
+msgstr ""
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr ""
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: template/functions.php:104
+msgid "last year"
+msgstr ""
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr ""
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8faee77648b17473500c10eea38f994da7132a76
--- /dev/null
+++ b/l10n/nqo/settings.po
@@ -0,0 +1,572 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:284
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:277
+msgid "add group"
+msgstr ""
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:246 templates/personal.php:164
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..d377705d79dba1e7a448a345c616cf0bd476538a
--- /dev/null
+++ b/l10n/nqo/user_ldap.po
@@ -0,0 +1,406 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr ""
diff --git a/l10n/nqo/user_webdavauth.po b/l10n/nqo/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..c509260cd3b361b257a8d46978820caa47b5d063
--- /dev/null
+++ b/l10n/nqo/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 5b2896c6e354c006f54ca2732cad0b61655308ac..42aeba0c1890601439a631baca587ead5fafaaf3 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Pas de categorias seleccionadas per escafar."
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Dimenge"
@@ -166,59 +186,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "uèi"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "mes passat"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "meses a"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "an passat"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "ans a"
@@ -226,22 +246,26 @@ msgstr "ans a"
msgid "Choose"
msgstr "Causís"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "D'accòrdi"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "Parteja"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error al partejar"
@@ -327,67 +351,67 @@ msgstr "Met la data d'expiracion"
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crea"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "met a jorn"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "escafa"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "parteja"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usancièrs"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -600,7 +624,7 @@ msgstr "Configuracion acabada"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sortida"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index d33b8a7f8a8f102c45ef67937f79ec8f3510cfe0..1630f022556051969ff6c5e51ff4f77741716190 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Error"
@@ -127,57 +127,57 @@ msgstr ""
msgid "Rename"
msgstr "Torna nomenar"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Al esperar"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "remplaça"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "nom prepausat"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "anulla"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "defar"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr "fichièrs al amontcargar"
@@ -215,15 +215,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Nom"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Talha"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Modificat"
@@ -300,33 +300,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Pas res dedins. Amontcarga qualquaren"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Avalcarga"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Pas partejador"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Escafa"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Amontcargament tròp gròs"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Los fiichièrs son a èsser explorats, "
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Exploracion en cors"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 253801f6c9f075e167561a814d3d1776a9fa7f50..a94307e4bfd08313201b25d3ec9f1262d48b571f 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Avalcarga"
@@ -75,6 +75,6 @@ msgstr "Amontcarga"
msgid "Cancel upload"
msgstr " Anulla l'amontcargar"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 5cbb1c5e010fad58ff96d5db0af889c963f8cfd0..a1e7d21d338a51b440a381256644d43f1b771cfd 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Usancièrs"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Services web jos ton contraròtle"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segonda a"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "uèi"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ièr"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mes passat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "an passat"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ans a"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 6a06eef3b99025ffe30966ed78454fbfab30fab6..bbc9fecb0b722ec8d4580bd4a8c292be1ca20aef 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Pas capable de tira un usancièr del grop %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactiva"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activa"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Enregistra..."
@@ -148,16 +152,16 @@ msgstr "defar"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grops"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Escafa"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Mai d'aquò"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Senhal"
@@ -438,7 +442,7 @@ msgstr "Senhal novèl"
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "Ton adreiça de corrièl"
msgid "Fill in an email address to enable password recovery"
msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Lenga"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Autres"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Non d'usancièr"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index b4c7072825e2639dde124a457eeea5a36e5049b0..48c4e281c6dd65ba497e0ff0c60d78123c64863f 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 6680a8ba6b328192d4b02644e61ae8576203ea3e..7e3a4dd2baa6872116af964d496b5126a5399b28 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -30,28 +30,28 @@ msgstr "grupa"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Włączony tryb konserwacji"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Wyłączony tryb konserwacji"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Zaktualizuj bazę"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualizowanie filecache, to może potrwać bardzo długo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Zaktualizuj filecache"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% udane ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +92,26 @@ msgstr "Nie zaznaczono kategorii do usunięcia."
msgid "Error removing %s from favorites."
msgstr "Błąd podczas usuwania %s z ulubionych."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Niedziela"
@@ -168,63 +188,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Grudzień"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n minute temu"
+msgstr[1] "%n minut temu"
+msgstr[2] "%n minut temu"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n godzine temu"
+msgstr[1] "%n godzin temu"
+msgstr[2] "%n godzin temu"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "dziś"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n dzień temu"
+msgstr[1] "%n dni temu"
+msgstr[2] "%n dni temu"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n miesiąc temu"
+msgstr[1] "%n miesięcy temu"
+msgstr[2] "%n miesięcy temu"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "lat temu"
@@ -232,22 +252,26 @@ msgstr "lat temu"
msgid "Choose"
msgstr "Wybierz"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Błąd podczas ładowania pliku wybranego szablonu"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -257,7 +281,7 @@ msgstr "Nie określono typu obiektu."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Błąd"
@@ -277,7 +301,7 @@ msgstr "Udostępniono"
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
@@ -333,67 +357,67 @@ msgstr "Ustaw datę wygaśnięcia"
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "utwórz"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "usuń"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "współdziel"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail wysłany"
@@ -408,10 +432,10 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s reset hasła"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -477,7 +501,7 @@ msgstr "Osobiste"
msgid "Users"
msgstr "Użytkownicy"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikacje"
@@ -606,7 +630,7 @@ msgstr "Zakończ konfigurowanie"
msgid "%s is available. Get more information on how to update."
msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Wyloguj"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 8bab0cf59086485d3b5b93fe65980ce64b8ed5da..780faa39bcc43c2b3d6d98518cd38bfdae1b2518 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -4,14 +4,15 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Mariusz Fik <fisiu@opensuse.org>, 2013
# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -160,27 +161,27 @@ msgstr "cofnij"
#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n katalog"
+msgstr[1] "%n katalogi"
+msgstr[2] "%n katalogów"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n plik"
+msgstr[1] "%n pliki"
+msgstr[2] "%n plików"
#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{katalogi} and {pliki}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wysyłanie %n pliku"
+msgstr[1] "Wysyłanie %n plików"
+msgstr[2] "Wysyłanie %n plików"
#: js/filelist.js:628
msgid "files uploading"
@@ -212,7 +213,7 @@ msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki."
#: js/files.js:245
msgid ""
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 8241e75f710a0500a495832824ec67a0b6da1ccc..0598448aa83d75c9582771ad59a1ddb153fdd1db 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s współdzieli folder z tobą %s"
msgid "%s shared the file %s with you"
msgstr "%s współdzieli z tobą plik %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Pobierz"
@@ -76,6 +76,6 @@ msgstr "Wyślij"
msgid "Cancel upload"
msgstr "Anuluj wysyłanie"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Podgląd nie jest dostępny dla"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index fd82c9bdd6ddd777e02399adbd5d31fdcf35458c..d06393b1c89b8f51fad4bdb9cae6e73d17eb63ef 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-04 22:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -28,45 +28,45 @@ msgstr "Nie można trwale usunąć %s"
msgid "Couldn't restore %s"
msgstr "Nie można przywrócić %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "wykonywanie operacji przywracania"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Błąd"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "trwale usuń plik"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nazwa"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Usunięte"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n katalogów"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n plików"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "przywrócony"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index d44b5a180f122e17a74de60c23cbc53ee557ef29..beae34e58032bc7e70e077bf6d9a9983ee137da3 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Nie określono nazwy aplikacji"
#: app.php:361
msgid "Help"
@@ -49,11 +49,23 @@ msgstr "Użytkownicy"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Błąd przy aktualizacji \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Kontrolowane serwisy"
@@ -87,59 +99,59 @@ msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administrato
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nie określono źródła podczas instalacji aplikacji"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nie określono linku skąd aplikacja ma być zainstalowana"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nie określono lokalnego pliku z którego miała być instalowana aplikacja"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Typ archiwum %s nie jest obsługiwany"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Nie udało się otworzyć archiwum podczas instalacji aplikacji"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikacja nie posiada pliku info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Katalog aplikacji już isnieje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -265,55 +277,55 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekund temu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n minute temu"
+msgstr[1] "%n minut temu"
+msgstr[2] "%n minut temu"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n godzinę temu"
+msgstr[1] "%n godzin temu"
+msgstr[2] "%n godzin temu"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dziś"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "wczoraj"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n dzień temu"
+msgstr[1] "%n dni temu"
+msgstr[2] "%n dni temu"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n miesiąc temu"
+msgstr[1] "%n miesięcy temu"
+msgstr[2] "%n miesięcy temu"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "w zeszłym roku"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "lat temu"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 13437f51c48ce887d4db36b7e4075e18a1e4664a..d0f1cfcc15d7cef7abc735fa36610f8f9c5e06db 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +86,59 @@ msgstr "Nie można usunąć użytkownika z grupy %s"
msgid "Couldn't update app."
msgstr "Nie można uaktualnić aplikacji."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualizacja do {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Wyłącz"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Włącz"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Proszę czekać..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Błąd podczas wyłączania aplikacji"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Błąd podczas włączania aplikacji"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Aktualizacja w toku..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Błąd podczas aktualizacji aplikacji"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Błąd"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Aktualizuj"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:217
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:262
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
+
+#: js/personal.js:284
msgid "Saving..."
msgstr "Zapisywanie..."
@@ -150,16 +154,16 @@ msgstr "cofnij"
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Usuń"
@@ -179,7 +183,7 @@ msgstr "Błąd podczas tworzenia użytkownika"
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "polski"
@@ -194,7 +198,7 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr ""
+msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -231,7 +235,7 @@ msgid ""
"System locale can't be set to %s. This means that there might be problems "
"with certain characters in file names. We strongly suggest to install the "
"required packages on your system to support %s."
-msgstr ""
+msgstr "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +248,7 @@ msgid ""
"installation of 3rd party apps don´t work. Accessing files from remote and "
"sending of notification emails might also not work. We suggest to enable "
"internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +262,11 @@ msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę."
#: templates/admin.php:120
msgid "Sharing"
@@ -291,7 +295,7 @@ msgstr "Pozwól na publiczne wczytywanie"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -327,7 +331,7 @@ msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączeni
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +349,11 @@ msgstr "Więcej"
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Hasło"
@@ -440,7 +444,7 @@ msgstr "Nowe hasło"
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Wyświetlana nazwa"
@@ -456,40 +460,68 @@ msgstr "Twój adres e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Język"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Użyj tego adresu do <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Hasło logowania"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Odszyfruj wszystkie pliki"
#: templates/users.php:21
msgid "Login Name"
@@ -513,30 +545,30 @@ msgstr "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zm
msgid "Default Storage"
msgstr "Magazyn domyślny"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Bez limitu"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Inne"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nazwa użytkownika"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Magazyn"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "zmień wyświetlaną nazwę"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ustaw nowe hasło"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index f2571b2fb2ac683d8979a2d4672d17aff1a22579..fc5af2df2130b7aeaf2827362eb0e49cfc6b4142 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index b3280313839b148db83d3e732feaba17557d6a36..f8c924a94752d4f90c14c59898b257f906f0ea68 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -30,28 +30,28 @@ msgstr "grupo"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Ativar modo de manutenção"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desligar o modo de manutenção"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Atualizar o banco de dados"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Atualizar cahe de arquivos, isto pode levar algum tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Atualizar cache de arquivo"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% concluído ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +92,26 @@ msgstr "Nenhuma categoria selecionada para remoção."
msgid "Error removing %s from favorites."
msgstr "Erro ao remover %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -168,59 +188,59 @@ msgstr "novembro"
msgid "December"
msgstr "dezembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ha %n minuto"
+msgstr[1] "ha %n minutos"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n hora"
+msgstr[1] "ha %n horas"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hoje"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n dia"
+msgstr[1] "ha %n dias"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "último mês"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n mês"
+msgstr[1] "ha %n meses"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "último ano"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "anos atrás"
@@ -228,22 +248,26 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Template selecionador Erro ao carregar arquivo"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "O tipo de objeto não foi especificado."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erro"
@@ -273,7 +297,7 @@ msgstr "Compartilhados"
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
@@ -329,67 +353,67 @@ msgstr "Definir data de expiração"
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "criar"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "remover"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartilhar"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail enviado"
@@ -404,7 +428,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s redefinir senha"
@@ -473,7 +497,7 @@ msgstr "Pessoal"
msgid "Users"
msgstr "Usuários"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicações"
@@ -602,7 +626,7 @@ msgstr "Concluir configuração"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 53543fba7d5530c6acdad717de0aff0b8efc5f8d..b38bee5e90237933da95304db4296fb5f3558827 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-03 07:42-0400\n"
-"PO-Revision-Date: 2013-09-02 15:40+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+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"
@@ -161,14 +161,14 @@ msgstr "desfazer"
#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n pasta"
+msgstr[1] "%n pastas"
#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n arquivo"
+msgstr[1] "%n arquivos"
#: js/filelist.js:432
msgid "{dirs} and {files}"
@@ -177,8 +177,8 @@ msgstr "{dirs} e {files}"
#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Enviando %n arquivo"
+msgstr[1] "Enviando %n arquivos"
#: js/filelist.js:628
msgid "files uploading"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 511813205a79521007826eb3582df9534d79a81f..0c110ef8250e79718ce737ccb773f5c520793d9b 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s compartilhou a pasta %s com você"
msgid "%s shared the file %s with you"
msgstr "%s compartilhou o arquivo %s com você"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Baixar"
@@ -76,6 +76,6 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nenhuma visualização disponível para"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 3464db7a91185e6c94b42ccbafd79b6076f7c718..3b2ef25c158ba14a035550a8a7eba184b7b01493 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-10 13:30+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,43 +28,43 @@ msgstr "Não foi possível excluir %s permanentemente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "realizar operação de restauração"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Erro"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "excluir arquivo permanentemente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Excluído"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n pastas"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n arquivo"
+msgstr[1] "%n arquivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "restaurado"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d35e68a4ec15f79a4da0318e5ac71198366f5364..31eb50030d04a4e5f80ba478be415b5f3554783c 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:50+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -49,11 +49,23 @@ msgstr "Usuários"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falha na atualização de \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "serviços web sob seu controle"
@@ -106,37 +118,37 @@ msgstr "Arquivos do tipo %s não são suportados"
msgid "Failed to open archive when installing app"
msgstr "Falha para abrir o arquivo enquanto instalava o aplicativo"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "O aplicativo não fornece um arquivo info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Diretório App já existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Não é possível criar pasta app. Corrija as permissões. %s"
@@ -265,51 +277,51 @@ msgstr "Seu servidor web não está configurado corretamente para permitir sincr
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoje"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n dias"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "último mês"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "último ano"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 4214958d1ab6f0098650e90ed3e7b01bd3429c64..dac1766f084b7e6616f13292c4073b53d6df6b66 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:21+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -86,55 +86,59 @@ msgstr "Não foi possível remover usuário do grupo %s"
msgid "Couldn't update app."
msgstr "Não foi possível atualizar a app."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atualizar para {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desabilitar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Habilitar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Por favor, aguarde..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Erro enquanto desabilitava o aplicativo"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Erro enquanto habilitava o aplicativo"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Atualizando..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Erro ao atualizar aplicativo"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Erro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Atualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Salvando..."
@@ -150,16 +154,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Impossível remover usuário"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Excluir"
@@ -179,7 +183,7 @@ msgstr "Erro ao criar usuário"
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Português (Brasil)"
@@ -345,11 +349,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Mostrar este Assistente de novo"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Senha"
@@ -440,7 +444,7 @@ msgstr "Nova senha"
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome de Exibição"
@@ -456,38 +460,66 @@ msgstr "Seu endereço de e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Criptografia"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "O aplicativo de encriptação não está mais ativo, decripti todos os seus arquivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Senha de login"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decripti todos os Arquivos"
@@ -513,30 +545,30 @@ msgstr "Digite a senha de recuperação para recuperar os arquivos dos usuários
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de Usuário"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "alterar nome de exibição"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "definir nova senha"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index b2edb3b335ac97ce885aae1331b2fc316e5481e5..e54db81dd8330336a989fc41099871de8737fd0b 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index ee25766369129cc949e26083202e84e8805616ce..b355ad56e022a0f37bbc1b12f633bb7034909942 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -32,28 +32,28 @@ msgstr "grupo"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activado o modo de manutenção"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desactivado o modo de manutenção"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de dados actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "A actualizar o cache dos ficheiros, poderá demorar algum tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Actualizado o cache dos ficheiros"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% feito ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -94,6 +94,26 @@ msgstr "Nenhuma categoria seleccionada para eliminar."
msgid "Error removing %s from favorites."
msgstr "Erro a remover %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -170,59 +190,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Dezembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minuto atrás"
+msgstr[1] "%n minutos atrás"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n hora atrás"
+msgstr[1] "%n horas atrás"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hoje"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dia atrás"
+msgstr[1] "%n dias atrás"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "ultímo mês"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mês atrás"
+msgstr[1] "%n meses atrás"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "ano passado"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "anos atrás"
@@ -230,22 +250,26 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Erro ao carregar arquivo do separador modelo"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr "O tipo de objecto não foi especificado"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erro"
@@ -275,7 +299,7 @@ msgstr "Partilhado"
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Erro ao partilhar"
@@ -331,67 +355,67 @@ msgstr "Especificar data de expiração"
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "criar"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "apagar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partilhar"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail enviado"
@@ -406,10 +430,10 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s reposição da password"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -475,7 +499,7 @@ msgstr "Pessoal"
msgid "Users"
msgstr "Utilizadores"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicações"
@@ -604,7 +628,7 @@ msgstr "Acabar instalação"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Tenha mais informações como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 21d8f249a2bdeffdf39f4f2ade3bfb519969221c..7bd460d366bacfac9f7216123040297b02f15a34 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 14:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 200f818e9f3f1d0e94e59ac34a3f0b0cad7e10d8..7db55d8e767733f17c67b6db5ae47f279e975f10 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s partilhou a pasta %s consigo"
msgid "%s shared the file %s with you"
msgstr "%s partilhou o ficheiro %s consigo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Transferir"
@@ -77,6 +77,6 @@ msgstr "Carregar"
msgid "Cancel upload"
msgstr "Cancelar envio"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Não há pré-visualização para"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index b7393d9b03aa7ea74fbae09921528ec5a422b02d..a71bf02322231a5f0accb9cf9c925b3017daf558 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Utilizadores"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "A actualização \"%s\" falhou."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Minutos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minutos atrás"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n horas atrás"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoje"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dias atrás"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ultímo mês"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n meses atrás"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ano passado"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index e27686009541ae9a9934137f535c2d0e778db4a9..62b80e989cafea1af55e3d489b86272b4d679fad 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 14:50+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: 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"
@@ -132,11 +132,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
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:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "A guardar..."
@@ -152,16 +156,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possível remover o utilizador"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -181,7 +185,7 @@ msgstr "Erro a criar utilizador"
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -347,11 +351,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "Mostrar novamente Wizard de Arranque Inicial"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Password"
@@ -442,7 +446,7 @@ msgstr "Nova palavra-chave"
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome público"
@@ -458,38 +462,66 @@ msgstr "O seu endereço de email"
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Encriptação"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Password de entrada"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Desencriptar todos os ficheiros"
@@ -515,30 +547,30 @@ msgstr "Digite a senha de recuperação, a fim de recuperar os arquivos de usuá
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de utilizador"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "modificar nome exibido"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "definir nova palavra-passe"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 435fb6260982231c4f1a6fbdbb35e76856d9b3bc..03ef1f30c99aebfab54f05000f295823131c6509 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 6cbf39f5e0032d50cd081128506942516ddf42da..171346b912a4561e8d315fe69dd1f37776fa004e 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -94,6 +94,26 @@ msgstr "Nicio categorie selectată pentru ștergere."
msgid "Error removing %s from favorites."
msgstr "Eroare la ștergerea %s din favorite."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Duminică"
@@ -170,63 +190,63 @@ msgstr "Noiembrie"
msgid "December"
msgstr "Decembrie"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Setări"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "astăzi"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "ani în urmă"
@@ -234,22 +254,26 @@ msgstr "ani în urmă"
msgid "Choose"
msgstr "Alege"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -259,7 +283,7 @@ msgstr "Tipul obiectului nu este specificat."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Eroare"
@@ -279,7 +303,7 @@ msgstr "Partajat"
msgid "Share"
msgstr "Partajează"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Eroare la partajare"
@@ -335,67 +359,67 @@ msgstr "Specifică data expirării"
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control acces"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creare"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizare"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ștergere"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partajare"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Mesajul a fost expediat"
@@ -410,7 +434,7 @@ msgstr "Actualizarea a eșuat! Raportați problema către <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -479,7 +503,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Utilizatori"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicații"
@@ -608,7 +632,7 @@ msgstr "Finalizează instalarea"
msgid "%s is available. Get more information on how to update."
msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Ieșire"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c25183110d0dcf24d709f8d24ec01d895d4b9a6f..0ac14ca3c9100e59bbcdd247218ff75f214f6dd0 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -4,15 +4,16 @@
#
# Translators:
# dimaursu16 <dima@ceata.org>, 2013
+# inaina <ina.c.ina@gmail.com>, 2013
# ripkid666 <ripkid666@gmail.com>, 2013
# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: inaina <ina.c.ina@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +50,7 @@ msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
#: ajax/upload.php:67
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
+msgstr "Fisierul incarcat depaseste marimea maxima permisa in php.ini: "
#: ajax/upload.php:69
msgid ""
@@ -67,11 +68,11 @@ msgstr "Nu a fost încărcat nici un fișier"
#: ajax/upload.php:72
msgid "Missing a temporary folder"
-msgstr "Lipsește un director temporar"
+msgstr "Lipsește un dosar temporar"
#: ajax/upload.php:73
msgid "Failed to write to disk"
-msgstr "Eroare la scriere pe disc"
+msgstr "Eroare la scrierea discului"
#: ajax/upload.php:91
msgid "Not enough storage available"
@@ -83,7 +84,7 @@ msgstr "Încărcarea a eșuat"
#: ajax/upload.php:127
msgid "Invalid directory."
-msgstr "Director invalid."
+msgstr "registru invalid."
#: appinfo/app.php:12
msgid "Files"
@@ -91,7 +92,7 @@ msgstr "Fișiere"
#: js/file-upload.js:11
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
+msgstr "lista nu se poate incarca poate fi un fisier sau are 0 bytes"
#: js/file-upload.js:24
msgid "Not enough space available"
@@ -108,7 +109,7 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup
#: js/file-upload.js:239
msgid "URL cannot be empty."
-msgstr "Adresa URL nu poate fi goală."
+msgstr "Adresa URL nu poate fi golita"
#: js/file-upload.js:244 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
@@ -120,7 +121,7 @@ msgstr "Eroare"
#: js/fileactions.js:116
msgid "Share"
-msgstr "Partajează"
+msgstr "a imparti"
#: js/fileactions.js:126
msgid "Delete permanently"
@@ -132,7 +133,7 @@ msgstr "Redenumire"
#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
-msgstr "În așteptare"
+msgstr "in timpul"
#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
@@ -199,27 +200,27 @@ msgstr "Numele fișierului nu poate rămâne gol."
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
+msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere."
+msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate"
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
+msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%"
#: js/files.js:94
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele"
#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
+msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
#: js/files.js:563 templates/index.php:69
msgid "Name"
@@ -256,11 +257,11 @@ msgstr "max. posibil:"
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor"
+msgstr "necesar la descarcarea mai multor liste si fisiere"
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Activează descărcare fișiere compresate"
+msgstr "permite descarcarea codurilor ZIP"
#: templates/admin.php:20
msgid "0 is unlimited"
@@ -280,7 +281,7 @@ msgstr "Nou"
#: templates/index.php:10
msgid "Text file"
-msgstr "Fișier text"
+msgstr "lista"
#: templates/index.php:12
msgid "Folder"
@@ -300,7 +301,7 @@ msgstr "Anulează încărcarea"
#: templates/index.php:52
msgid "You don’t have write permissions here."
-msgstr "Nu ai permisiunea de a sterge fisiere aici."
+msgstr "Nu ai permisiunea de a scrie aici."
#: templates/index.php:59
msgid "Nothing in here. Upload something!"
@@ -312,7 +313,7 @@ msgstr "Descarcă"
#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
-msgstr "Anulare partajare"
+msgstr "Anulare"
#: templates/index.php:94 templates/index.php:95
msgid "Delete"
@@ -330,7 +331,7 @@ msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la
#: templates/index.php:115
msgid "Files are being scanned, please wait."
-msgstr "Fișierele sunt scanate, te rog așteptă."
+msgstr "Fișierele sunt scanate, asteptati va rog"
#: templates/index.php:118
msgid "Current scanning"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 34575f9a246881104342d3be0d9e78613464fd00..e0a966d6e0fe66e8f0e35dc260f30903221e6bd6 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s a partajat directorul %s cu tine"
msgid "%s shared the file %s with you"
msgstr "%s a partajat fișierul %s cu tine"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descarcă"
@@ -76,6 +76,6 @@ msgstr "Încărcare"
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nici o previzualizare disponibilă pentru "
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 2a84e7235cfcaa2a1aa7bc95bbc70125df596302..eae9302c753fb0a8db099f1b38b1751b9310b37c 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Utilizatori"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servicii web controlate de tine"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,55 +277,55 @@ msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "secunde în urmă"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "astăzi"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ieri"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ultima lună"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ultimul an"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ani în urmă"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1e816b50f094ed4977dd1a24843b098027ff2498..7e003bd6db65e008295934ace49bbef3ccd587eb 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -85,55 +85,59 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
msgid "Couldn't update app."
msgstr "Aplicaţia nu s-a putut actualiza."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizat la {versiuneaaplicaţiei}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Dezactivați"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activare"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Aşteptaţi vă rog...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizare în curs...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Eroare în timpul actualizării aplicaţiei"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Eroare"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizare"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizat"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Se salvează..."
@@ -149,16 +153,16 @@ msgstr "Anulează ultima acțiune"
msgid "Unable to remove user"
msgstr "Imposibil de eliminat utilizatorul"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Șterge"
@@ -178,7 +182,7 @@ msgstr "Eroare la crearea utilizatorului"
msgid "A valid password must be provided"
msgstr "Trebuie să furnizaţi o parolă validă"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_language_name_"
@@ -344,11 +348,11 @@ msgstr "Mai mult"
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parolă"
@@ -439,7 +443,7 @@ msgstr "Noua parolă"
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -455,38 +459,66 @@ msgstr "Adresa ta de email"
msgid "Fill in an email address to enable password recovery"
msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Limba"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Încriptare"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Stocare implicită"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Nelimitată"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altele"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nume utilizator"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Stocare"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index db4843a8a903215e685b9183c9feb4da3ff70aa3..e97322cda88a074bc43bdd4ec62a52557f7c90b1 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 7721c948b2ee4628797738e69c088da6f53674f2..1f90ed5e5ef75af72d0da101921c4839a3288bd5 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -98,6 +98,26 @@ msgstr "Нет категорий для удаления."
msgid "Error removing %s from favorites."
msgstr "Ошибка удаления %s из избранного"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Воскресенье"
@@ -174,63 +194,63 @@ msgstr "Ноябрь"
msgid "December"
msgstr "Декабрь"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Конфигурация"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минуту назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n час назад"
msgstr[1] "%n часа назад"
msgstr[2] "%n часов назад"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "сегодня"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n дня назад"
msgstr[2] "%n дней назад"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "в прошлом месяце"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n месяц назад"
msgstr[1] "%n месяца назад"
msgstr[2] "%n месяцев назад"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "несколько месяцев назад"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "несколько лет назад"
@@ -238,22 +258,26 @@ msgstr "несколько лет назад"
msgid "Choose"
msgstr "Выбрать"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Ошибка при загрузке файла выбора шаблона"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Нет"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ок"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -263,7 +287,7 @@ msgstr "Тип объекта не указан"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Ошибка"
@@ -283,7 +307,7 @@ msgstr "Общие"
msgid "Share"
msgstr "Открыть доступ"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Ошибка при открытии доступа"
@@ -339,67 +363,67 @@ msgstr "Установить срок доступа"
msgid "Expiration date"
msgstr "Дата окончания"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Поделится через электронную почту:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ни один человек не найден"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Общий доступ не разрешен"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Общий доступ к {item} с {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Закрыть общий доступ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "создать"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "обновить"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "удалить"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "открыть доступ"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене срока доступа"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Ошибка при установке срока доступа"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Отправляется ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Письмо отправлено"
@@ -414,7 +438,7 @@ msgstr "При обновлении произошла ошибка. Пожал
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s сброс пароля"
@@ -483,7 +507,7 @@ msgstr "Личное"
msgid "Users"
msgstr "Пользователи"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Приложения"
@@ -612,7 +636,7 @@ msgstr "Завершить установку"
msgid "%s is available. Get more information on how to update."
msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Выйти"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index a97a10cc9add05e8920f4fe0c39c0c9eea189671..2db89c27daa313b2b6c948946bcf7838f49ce6fa 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 5553e3a10ad1e9043379022b310efe90837fbd98..13ded27e566458e29c5128f7f03006aaf0aa3905 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Den4md <denstarr@mail.md>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s открыл доступ к папке %s для Вас"
msgid "%s shared the file %s with you"
msgstr "%s открыл доступ к файлу %s для Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Скачать"
@@ -77,6 +77,6 @@ msgstr "Загрузка"
msgid "Cancel upload"
msgstr "Отмена загрузки"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Предпросмотр недоступен для"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 70d8b918f39aa177a72be1933e894867db0a71c7..2f638c5bcd0ac30d3df9bb529f849b9f50bed066 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -51,11 +51,23 @@ msgstr "Пользователи"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Не смог обновить \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "веб-сервисы под вашим управлением"
@@ -108,37 +120,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -267,55 +279,55 @@ msgstr "Ваш веб сервер до сих пор не настроен пр
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минута назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n час назад"
msgstr[1] "%n часа назад"
msgstr[2] "%n часов назад"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "сегодня"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n дня назад"
msgstr[2] "%n дней назад"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "в прошлом месяце"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n месяц назад"
msgstr[1] "%n месяца назад"
msgstr[2] "%n месяцев назад"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "в прошлом году"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "несколько лет назад"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 2777eaad80fa03ff174d9ad6f9596523e34a0f47..1d7aae06c0f03e3fc0a01b2cf468b14bd5ee3107 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 07:10+0000\n"
-"Last-Translator: Aleksey Grigoryev <alexvamp@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -91,55 +91,59 @@ msgstr "Невозможно удалить пользователя из гру
msgid "Couldn't update app."
msgstr "Невозможно обновить приложение"
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Обновить до {версия приложения}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Выключить"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Включить"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Подождите..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Обновление..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Ошибка при обновлении приложения"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Ошибка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Обновить"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Сохранение..."
@@ -155,16 +159,16 @@ msgstr "отмена"
msgid "Unable to remove user"
msgstr "Невозможно удалить пользователя"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Группы"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Группа Администраторы"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Удалить"
@@ -184,7 +188,7 @@ msgstr "Ошибка создания пользователя"
msgid "A valid password must be provided"
msgstr "Укажите валидный пароль"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Русский "
@@ -350,11 +354,11 @@ msgstr "Больше"
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -421,7 +425,7 @@ msgstr "Показать помощник настройки"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Пароль"
@@ -445,7 +449,7 @@ msgstr "Новый пароль"
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Отображаемое имя"
@@ -461,38 +465,66 @@ msgstr "Ваш адрес электронной почты"
msgid "Fill in an email address to enable password recovery"
msgstr "Введите адрес электронной почты чтобы появилась возможность восстановления пароля"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Язык"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помочь с переводом"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифрование"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -518,30 +550,30 @@ msgstr "Введите пароль для того, чтобы восстано
msgid "Default Storage"
msgstr "Хранилище по-умолчанию"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограниченно"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Другое"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Имя пользователя"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "изменить отображаемое имя"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "установить новый пароль"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "По умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index f47972aa0b7637e661c1d40c1d097c1bde09104f..b231595c2f925f08ae8ef0a2355745a49cd4228c 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 87d7c2b49e75c842e98f6dd1580c03905bd1bf6d..a83cde1f4e2209b90c578aa0db94d6b4a5a24401 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "මකා දැමීම සඳහා ප්රවර්ගයන්
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "ඉරිදා"
@@ -166,59 +186,59 @@ msgstr "නොවැම්බර්"
msgid "December"
msgstr "දෙසැම්බර්"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "අද"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "පෙර මාසයේ"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "මාස කීපයකට පෙර"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -226,22 +246,26 @@ msgstr "අවුරුදු කීපයකට පෙර"
msgid "Choose"
msgstr "තෝරන්න"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "එපා"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "හරි"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "දෝෂයක්"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "බෙදා හදා ගන්න"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
msgid "Expiration date"
msgstr "කල් ඉකුත් විමේ දිනය"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "විද්යුත් තැපෑල මඟින් බෙදාගන්න: "
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ප්රවේශ පාලනය"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "සදන්න"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "බෙදාහදාගන්න"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "පෞද්ගලික"
msgid "Users"
msgstr "පරිශීලකයන්"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "යෙදුම්"
@@ -600,7 +624,7 @@ msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "නික්මීම"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index ea7a70653c1609a6ed1cd955d51acea1c23b0e53..00c7fd92b176f3c08f63e81f34407510ab77fd18 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index b281c905bc236514f08d99df85e834f711d1f680..c09a00ba7075c57e22443824072611a5a88498fa 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්
msgid "%s shared the file %s with you"
msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "බාන්න"
@@ -75,6 +75,6 @@ msgstr "උඩුගත කරන්න"
msgid "Cancel upload"
msgstr "උඩුගත කිරීම අත් හරින්න"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "පූර්වදර්ශනයක් නොමැත"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index ef707dcafd0bdafaabe9a9148a259b48779199d0..befb81f4fa0d481f911a1da248b7c320002bb8ea 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "පරිශීලකයන්"
msgid "Admin"
msgstr "පරිපාලක"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "අද"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ඊයේ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "පෙර මාසයේ"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 0aaa56ad95d04db9a65cf2df5e2e5c0abb9fa270..b5b546155828587c9517aef69875e6ddedd02df0 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "අක්රිය කරන්න"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "සක්රිය කරන්න"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "දෝෂයක්"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "යාවත්කාල කිරීම"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
@@ -148,16 +152,16 @@ msgstr "නිෂ්ප්රභ කරන්න"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "කණ්ඩායම්"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "කාණ්ඩ පරිපාලක"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "මකා දමන්න"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr "වැඩි"
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "මුර පදය"
@@ -438,7 +442,7 @@ msgstr "නව මුරපදය"
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "ඔබගේ විද්යුත් තැපෑල"
msgid "Fill in an email address to enable password recovery"
msgstr "මුරපද ප්රතිස්ථාපනය සඳහා විද්යුත් තැපැල් විස්තර ලබා දෙන්න"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "භාෂාව"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "ගුප්ත කේතනය"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "වෙනත්"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "පරිශීලක නම"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index d45dc54134082e738a8f06d1767ee3533e5a4779..9628a98779c7e89c383a82a6ef6c12636454076a 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 921159e7c4d858bab2d9ce14f14c28b274585fd2..0d0fc7e389df4f467d9515af345f785bedfab82d 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,63 +186,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -230,22 +250,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -275,7 +299,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -331,67 +355,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -406,7 +430,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -604,7 +628,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index a2deec2de35d029bc43314a8c283b1198a2a1427..27f317215a56ae049443eba77b4b7b760179e751 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index a5b82a490e7b1537656ed7aded47dbf75bfc9bd0..f3a3428961177913e48365a13897849d2de2f59c 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index d1688333716075b001586fe425f8a55731f37226..d1abe24db2da5d9b964c843ddfa942984179cdf2 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
msgid "Error removing %s from favorites."
msgstr "Chyba pri odstraňovaní %s z obľúbených položiek."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Nedeľa"
@@ -168,63 +188,63 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minútou"
msgstr[1] "pred %n minútami"
msgstr[2] "pred %n minútami"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n hodinou"
msgstr[1] "pred %n hodinami"
msgstr[2] "pred %n hodinami"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "dnes"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "včera"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dňom"
msgstr[1] "pred %n dňami"
msgstr[2] "pred %n dňami"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesiacom"
msgstr[1] "pred %n mesiacmi"
msgstr[2] "pred %n mesiacmi"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "pred rokmi"
@@ -232,22 +252,26 @@ msgstr "pred rokmi"
msgid "Choose"
msgstr "Výber"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Chyba pri načítaní šablóny výberu súborov"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -257,7 +281,7 @@ msgstr "Nešpecifikovaný typ objektu."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Chyba"
@@ -277,7 +301,7 @@ msgstr "Zdieľané"
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
@@ -333,67 +357,67 @@ msgstr "Nastaviť dátum expirácie"
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Zdieľať cez e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "vymazať"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "zdieľať"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email odoslaný"
@@ -408,7 +432,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "reset hesla %s"
@@ -477,7 +501,7 @@ msgstr "Osobné"
msgid "Users"
msgstr "Používatelia"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikácie"
@@ -606,7 +630,7 @@ msgstr "Dokončiť inštaláciu"
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odhlásiť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 0ec318ec279decdfdb9b816d28458980de7ec7fb..13b2c321e869f721d9ebf7d84587a54871fcc791 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 1a88ff07b4c02830c5450da1321b43b429c4917e..8d7b07737fe0d20e97f614ab8927fb9039e1021b 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s zdieľa s vami priečinok %s"
msgid "%s shared the file %s with you"
msgstr "%s zdieľa s vami súbor %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Sťahovanie"
@@ -76,6 +76,6 @@ msgstr "Odoslať"
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Žiaden náhľad k dispozícii pre"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 0bfa7fd164be3810a3c4bd64cf51d61025e2fbde..8d4dc2dc8911717c37e6d489bc06b1d3a47a2963 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-28 18:40+0000\n"
-"Last-Translator: martin\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,11 +50,23 @@ msgstr "Používatelia"
msgid "Admin"
msgstr "Administrátor"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Zlyhala aktualizácia \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webové služby pod Vašou kontrolou"
@@ -107,37 +119,37 @@ msgstr "Typ archívu %s nie je podporovaný"
msgid "Failed to open archive when installing app"
msgstr "Zlyhanie pri otváraní archívu počas inštalácie aplikácie"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Aplikácia neposkytuje súbor info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Aplikácia nemôže byť inštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Aplikačný adresár už existuje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s"
@@ -266,55 +278,55 @@ msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pret
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pred sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n minútami"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n hodinami"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dnes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n dňami"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "minulý mesiac"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n mesiacmi"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "pred rokmi"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 809ca007cb64089cbf444dbd2bf00b710a1764a2..5417b89d08b57e651e5e01a6e1f1213228777ff9 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-28 18:11+0000\n"
-"Last-Translator: martin\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -130,11 +130,15 @@ msgstr "Aktualizovať"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Ukladám..."
@@ -150,16 +154,16 @@ msgstr "vrátiť"
msgid "Unable to remove user"
msgstr "Nemožno odobrať používateľa"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Zmazať"
@@ -179,7 +183,7 @@ msgstr "Chyba pri vytváraní používateľa"
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Slovensky"
@@ -345,11 +349,11 @@ msgstr "Viac"
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Znovu zobraziť sprievodcu prvým spustením"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Heslo"
@@ -440,7 +444,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Zobrazované meno"
@@ -456,38 +460,66 @@ msgstr "Vaša emailová adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrovanie"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Prihlasovacie heslo"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dešifrovať všetky súbory"
@@ -513,30 +545,30 @@ msgstr "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla"
msgid "Default Storage"
msgstr "Predvolené úložisko"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Nelimitované"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Iné"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Meno používateľa"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Úložisko"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "zmeniť zobrazované meno"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastaviť nové heslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index df53e53b608a1f764516f6c0d8e536cfba6f16f8..4c4d7f82839074f8218ca6deddcecd84f25e34e3 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-28 18:21+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: martin\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 73fa71d789dc324684385cddfe8d04a5be3753fc..5df1c0fa5c19e36988ba89e5e59102569b2b2849 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -92,6 +92,26 @@ msgstr "Za izbris ni izbrana nobena kategorija."
msgid "Error removing %s from favorites."
msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "nedelja"
@@ -168,15 +188,15 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -184,7 +204,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -192,15 +212,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "danes"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "včeraj"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -208,11 +228,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -220,15 +240,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "let nazaj"
@@ -236,22 +256,26 @@ msgstr "let nazaj"
msgid "Choose"
msgstr "Izbor"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "V redu"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -261,7 +285,7 @@ msgstr "Vrsta predmeta ni podana."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Napaka"
@@ -281,7 +305,7 @@ msgstr "V souporabi"
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Napaka med souporabo"
@@ -337,67 +361,67 @@ msgstr "Nastavi datum preteka"
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Souporaba preko elektronske pošte:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ustvari"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "posodobi"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "izbriši"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "določi souporabo"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Zaščiteno z geslom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Napaka med nastavljanjem datuma preteka"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
@@ -412,7 +436,7 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -481,7 +505,7 @@ msgstr "Osebno"
msgid "Users"
msgstr "Uporabniki"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programi"
@@ -610,7 +634,7 @@ msgstr "Končaj namestitev"
msgid "%s is available. Get more information on how to update."
msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 79716d1228f93cd4fb6fa68fc58f0c53c00d0d16..6b461d6107b5fa1867783e411b86235affd14dcc 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 4ee20dcd09f6f40e0cc5c6f638de08e302945a25..b038230f56a4e1e552e3d1ef8d237fc80838acab 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "Oseba %s je določila mapo %s za souporabo"
msgid "%s shared the file %s with you"
msgstr "Oseba %s je določila datoteko %s za souporabo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Prejmi"
@@ -75,6 +75,6 @@ msgstr "Pošlji"
msgid "Cancel upload"
msgstr "Prekliči pošiljanje"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Predogled ni na voljo za"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 38ac1137b6fd5b6fb4af7926ee9000185aaf4818..871f8629966cffebc40264e7460dae38d71510cc 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Uporabniki"
msgid "Admin"
msgstr "Skrbništvo"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,11 +277,11 @@ msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -277,7 +289,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -285,15 +297,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "danes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včeraj"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -301,11 +313,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "zadnji mesec"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -313,11 +325,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "lansko leto"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "let nazaj"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2ffd3e80111d74400b848e2283e6cc862df9993a..c9e719828cf462ff05605f386da508b15d24755c 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -86,55 +86,59 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
msgid "Couldn't update app."
msgstr "Programa ni mogoče posodobiti."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Posodobi na {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Onemogoči"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Omogoči"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Počakajte ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Poteka posodabljanje ..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Prišlo je do napake med posodabljanjem programa."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Napaka"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Posodobi"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
@@ -150,16 +154,16 @@ msgstr "razveljavi"
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoče odstraniti"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Izbriši"
@@ -179,7 +183,7 @@ msgstr "Napaka ustvarjanja uporabnika"
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Slovenščina"
@@ -345,11 +349,11 @@ msgstr "Več"
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Različica"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -416,7 +420,7 @@ msgstr "Zaženi čarovnika prvega zagona"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Geslo"
@@ -440,7 +444,7 @@ msgstr "Novo geslo"
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Prikazano ime"
@@ -456,38 +460,66 @@ msgstr "Osebni elektronski naslov"
msgid "Fill in an email address to enable password recovery"
msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Sodelujte pri prevajanju"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifriranje"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +545,30 @@ msgstr "Vnesite geslo za obnovitev, ki ga boste uporabljali za obnovitev datotek
msgid "Default Storage"
msgstr "Privzeta shramba"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neomejeno"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uporabniško ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Shramba"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "spremeni prikazano ime"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastavi novo geslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index cc6fa550f76b8e39935fe26e8b2af0b0f1c9ba7b..4a826a92f8c417b5282199dbbf168c5908677cb2 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 5b7abe91daa6e40d179a1616160014fded472d2e..d87486309e3f7a7f6f5e53bab5dbfc06e6dc94d9 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -22,36 +22,36 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s ndau »%s« me ju"
#: ajax/share.php:227
msgid "group"
-msgstr ""
+msgstr "grupi"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Mënyra e mirëmbajtjes u aktivizua"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Mënyra e mirëmbajtjes u çaktivizua"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database-i u azhurnua"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Memorja e skedarëve u azhornua"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% u krye ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +92,26 @@ msgstr "Nuk selektuar për tu eliminuar asnjë kategori."
msgid "Error removing %s from favorites."
msgstr "Veprim i gabuar gjatë heqjes së %s nga të parapëlqyerat."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "E djelë"
@@ -168,59 +188,59 @@ msgstr "Nëntor"
msgid "December"
msgstr "Dhjetor"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minut më parë"
+msgstr[1] "%n minuta më parë"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n orë më parë"
+msgstr[1] "%n orë më parë"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "sot"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "dje"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ditë më parë"
+msgstr[1] "%n ditë më parë"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n muaj më parë"
+msgstr[1] "%n muaj më parë"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "vite më parë"
@@ -228,22 +248,26 @@ msgstr "vite më parë"
msgid "Choose"
msgstr "Zgjidh"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Në rregull"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +277,7 @@ msgstr "Nuk është specifikuar tipi i objektit."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Veprim i gabuar"
@@ -273,7 +297,7 @@ msgstr "Ndarë"
msgid "Share"
msgstr "Nda"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
@@ -329,67 +353,67 @@ msgstr "Cakto datën e përfundimit"
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "krijo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "azhurno"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimino"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "nda"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email-i u dërgua"
@@ -404,10 +428,10 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "Kodi i %s -it u rivendos"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -439,7 +463,7 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
@@ -473,7 +497,7 @@ msgstr "Personale"
msgid "Users"
msgstr "Përdoruesit"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "App"
@@ -524,7 +548,7 @@ msgstr "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt."
#: templates/installation.php:32
msgid ""
@@ -549,7 +573,7 @@ msgstr "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga i
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -600,9 +624,9 @@ msgstr "Mbaro setup-in"
#: templates/layout.user.php:41
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Dalje"
@@ -641,7 +665,7 @@ msgstr "Hyrje alternative"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 506285caa5a60fbc8cb1f8f1b1862c57c36ab300..3bf0e4962c0823e69fd09c8489f5029c0e2fb5ec 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,11 +30,11 @@ msgstr "%s nuk u spostua"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nuk është i mundur caktimi i dosjes së ngarkimit."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Përmbajtje e pavlefshme"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -76,7 +77,7 @@ msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme"
#: ajax/upload.php:109
msgid "Upload failed"
-msgstr ""
+msgstr "Ngarkimi dështoi"
#: ajax/upload.php:127
msgid "Invalid directory."
@@ -109,9 +110,9 @@ msgstr "URL-i nuk mund të jetë bosh."
#: js/file-upload.js:244 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i"
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "Veprim i gabuar"
@@ -127,57 +128,57 @@ msgstr "Elimino përfundimisht"
msgid "Rename"
msgstr "Riemërto"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "Pezulluar"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} ekziston"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "zëvëndëso"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "sugjero një emër"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "anulo"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr "U zëvëndësua {new_name} me {old_name}"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "anulo"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dosje"
+msgstr[1] "%n dosje"
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n skedar"
+msgstr[1] "%n skedarë"
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} dhe {files}"
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Po ngarkoj %n skedar"
+msgstr[1] "Po ngarkoj %n skedarë"
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr "po ngarkoj skedarët"
@@ -207,7 +208,7 @@ msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj."
#: js/files.js:245
msgid ""
@@ -215,22 +216,22 @@ msgid ""
"big."
msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Emri"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Dimensioni"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Modifikuar"
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "Nuk është i mundur riemërtimi i %s"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -300,33 +301,33 @@ msgstr "Nuk keni të drejta për të shkruar këtu."
msgid "Nothing in here. Upload something!"
msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Shkarko"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Elimino"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Ngarkimi është shumë i madh"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr "Skedarët po analizohen, ju lutemi pritni."
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr "Analizimi aktual"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 4e5d0ed5b8d3f55ccfc712477521423d0ec7892c..e1a91f7789c8f1bc0de8c9364305cc85f416618a 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Kodi është i gabuar. Provojeni përsëri."
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "Parashtro"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Arsyet mund të jenë:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "elementi është eliminuar"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "lidhja ka skaduar"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "ndarja është çaktivizuar"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
#: templates/public.php:15
#, php-format
@@ -63,7 +64,7 @@ msgstr "%s ndau me ju dosjen %s"
msgid "%s shared the file %s with you"
msgstr "%s ndau me ju skedarin %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Shkarko"
@@ -75,6 +76,6 @@ msgstr "Ngarko"
msgid "Cancel upload"
msgstr "Anulo ngarkimin"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Shikimi paraprak nuk është i mundur për"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index cd243657ba0acb936ab6dd8a53837159075c6f28..a359590d5750bf0b4a934db21d775b57bfeef0a3 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 23:00+0000\n"
+"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
msgid "Couldn't restore %s"
msgstr "Nuk munda ta rivendos %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "ekzekuto operacionin e rivendosjes"
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "eliminoje përfundimisht skedarin"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Emri"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Eliminuar"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dosje"
+msgstr[1] "%n dosje"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n skedar"
+msgstr[1] "%n skedarë"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "rivendosur"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 84fd768e0f8321b4e380d9a0f20bfb9e0dc3de0c..e10fb8cdfd900bf6d47d36ace9a330d3a99f8678 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Përdoruesit"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "shërbime web nën kontrollin tënd"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkro
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekonda më parë"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minuta më parë"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n orë më parë"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "sot"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "dje"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n ditë më parë"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "muajin e shkuar"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n muaj më parë"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "vitin e shkuar"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "vite më parë"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 9e65797efea8cb03b2b9334e0af1b877b572dfeb..1aad69565c531f0935e16d9062d4cf89bcef062b 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "Kërkesë e pavlefshme"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Azhurno"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr "anulo"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Elimino"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kodi"
@@ -438,7 +442,7 @@ msgstr "Kodi i ri"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
-msgstr ""
+msgstr "Të tjera"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Përdoruesi"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index f8f129da269d61452849ca8de847ca999eb8cd03..89615eb99c3f072bfdf03dcf65050b7a5c1515a2 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 3a92c45714024e4de73725be84dabad818c51cc0..c146f275ab38446cf7bd594fe46a57eb232995a0 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Ни једна категорија није означена за бр
msgid "Error removing %s from favorites."
msgstr "Грешка приликом уклањања %s из омиљених"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Недеља"
@@ -166,63 +186,63 @@ msgstr "Новембар"
msgid "December"
msgstr "Децембар"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Поставке"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "данас"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "прошлог месеца"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "месеци раније"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "прошле године"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "година раније"
@@ -230,22 +250,26 @@ msgstr "година раније"
msgid "Choose"
msgstr "Одабери"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "У реду"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr "Врста објекта није подешена."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -275,7 +299,7 @@ msgstr ""
msgid "Share"
msgstr "Дели"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Грешка у дељењу"
@@ -331,67 +355,67 @@ msgstr "Постави датум истека"
msgid "Expiration date"
msgstr "Датум истека"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Особе нису пронађене."
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} са {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "права приступа"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "направи"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ажурирај"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "обриши"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "подели"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума истека"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Грешка код постављања датума истека"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Порука је послата"
@@ -406,7 +430,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr "Лично"
msgid "Users"
msgstr "Корисници"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Апликације"
@@ -604,7 +628,7 @@ msgstr "Заврши подешавање"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 5e4429bcc040fcb88c54070ca161edf26e038fee..31dda625a60f04644bb70cabcbd42e10af4f2038 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 0b670840b6048404aba67d0a8e7d45c18490e8fb..db4a7eeb22e5ee6432a7b4f4f8b96b5fc3fc9fcd 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Преузми"
@@ -75,6 +75,6 @@ msgstr "Отпреми"
msgid "Cancel upload"
msgstr "Прекини отпремање"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 1a0c5931797b5e9cdb8a10d95657d93fdc1c58cd..60393d5c2a634f53eeff0e8813fe6f429b374e87 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Корисници"
msgid "Admin"
msgstr "Администратор"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "веб сервиси под контролом"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr "Ваш веб сервер тренутно не подржава син
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "данас"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "јуче"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "прошлог месеца"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "прошле године"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "година раније"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 1bbe0a101e5f978acc9a47670bc04de083d43ea3..9f2fe8c7c89c0c03ce2a21ca44bcbdbea10bd254 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Не могу да уклоним корисника из групе %s"
msgid "Couldn't update app."
msgstr "Не могу да ажурирам апликацију."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Ажурирај на {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Искључи"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Омогући"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Сачекајте…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Ажурирам…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Грешка при ажурирању апликације"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ажурирај"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Ажурирано"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Чување у току..."
@@ -148,16 +152,16 @@ msgstr "опозови"
msgid "Unable to remove user"
msgstr "Не могу да уклоним корисника"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Групе"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Обриши"
@@ -177,7 +181,7 @@ msgstr "Грешка при прављењу корисника"
msgid "A valid password must be provided"
msgstr "Морате унети исправну лозинку"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Више"
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "Поново прикажи чаробњак за прво покрет
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Лозинка"
@@ -438,7 +442,7 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Име за приказ"
@@ -454,38 +458,66 @@ msgstr "Ваша адреса е-поште"
msgid "Fill in an email address to enable password recovery"
msgstr "Ун"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Језик"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифровање"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Подразумевано складиште"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Друго"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Корисничко име"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Складиште"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "промени име за приказ"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "постави нову лозинку"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a563a3a7ca595239591916ce12d3b04cb90a3822..57813276079fdef71d2e2042d04eef05aba2a271 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index d4e845dc023743338dc492b14bc50676736c096e..89721e4a20ba3347e367c7d9dfca8a11f8b84486 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Nedelja"
@@ -166,63 +186,63 @@ msgstr "Novembar"
msgid "December"
msgstr "Decembar"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -230,22 +250,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -275,7 +299,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -331,67 +355,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -406,7 +430,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr "Lično"
msgid "Users"
msgstr "Korisnici"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programi"
@@ -604,7 +628,7 @@ msgstr "Završi podešavanje"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 429c1a1d2f636d89e7297d1128b9970491af2cc4..c1b281b797fc1d0c0e3532eb8447f7c8f93a865d 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr ""
@@ -127,60 +127,60 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -218,15 +218,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "Ime"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "Veličina"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "Zadnja izmena"
@@ -303,33 +303,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "Ovde nema ničeg. Pošaljite nešto!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 370cbd5e775f5a34349e008483ca63050904dec7..875bfffa7f314a54aa1b0cb3e1ffc92cd0247559 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Preuzmi"
@@ -75,6 +75,6 @@ msgstr "Pošalji"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 9448ebc4c40d5f6eab6f21108909fcc62995e04b..6af1411e01bbda82fa741ec1b9f0ee05fb6455ae 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Korisnici"
msgid "Admin"
msgstr "Adninistracija"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index cdf4509a43eb591f29f4da85a37bf82a0441804e..cc6f3b2d5bd6524e261d2954f83ba9763030b381 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Obriši"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lozinka"
@@ -438,7 +442,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Korisničko ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 883e7aae577c518bcd4759bae17cb583c4bbb243..cdb427f5c8c90c127ba695e3b72f9ee299634c8b 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 04d23af90d92f77ce6d806dc2e29aaf03fc28b8c..4ed86320a277bcbb23e2303578d5623fe193f080 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -94,6 +94,26 @@ msgstr "Inga kategorier valda för radering."
msgid "Error removing %s from favorites."
msgstr "Fel vid borttagning av %s från favoriter."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Söndag"
@@ -170,59 +190,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "månader sedan"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "förra året"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "år sedan"
@@ -230,22 +250,26 @@ msgstr "år sedan"
msgid "Choose"
msgstr "Välj"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fel vid inläsning av filväljarens mall"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr "Objekttypen är inte specificerad."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fel"
@@ -275,7 +299,7 @@ msgstr "Delad"
msgid "Share"
msgstr "Dela"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fel vid delning"
@@ -331,67 +355,67 @@ msgstr "Sätt utgångsdatum"
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "skapa"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uppdatera"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "radera"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dela"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-post skickat"
@@ -406,7 +430,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s återställ lösenord"
@@ -475,7 +499,7 @@ msgstr "Personligt"
msgid "Users"
msgstr "Användare"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Program"
@@ -604,7 +628,7 @@ msgstr "Avsluta installation"
msgid "%s is available. Get more information on how to update."
msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logga ut"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 2e311fca6d769b044f79eaaabb8a7f0701597f8b..6b498778cf9443d23193d5a36f0609733e4fa6fa 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-31 16:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 05283db1ee5f3fe34b016270ec6a2df66fa82ce5..2716b5f204cca7e4d0df4b5950bb73dd476b3377 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s delade mappen %s med dig"
msgid "%s shared the file %s with you"
msgstr "%s delade filen %s med dig"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Ladda ner"
@@ -77,6 +77,6 @@ msgstr "Ladda upp"
msgid "Cancel upload"
msgstr "Avbryt uppladdning"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ingen förhandsgranskning tillgänglig för"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 68d9e0761320cb8415d12c5a05ea5240d919c49a..8865b3f1d8d84a0451d56b530c8a76dda0106f73 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:33-0400\n"
-"PO-Revision-Date: 2013-08-28 12:10+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,11 +51,23 @@ msgstr "Användare"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Misslyckades med att uppgradera \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
@@ -108,37 +120,37 @@ msgstr "Arkiv av typen %s stöds ej"
msgid "Failed to open archive when installing app"
msgstr "Kunde inte öppna arkivet när appen skulle installeras"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Appen har ingen info.xml fil"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Appen kan inte installeras eftersom att den innehåller otillåten kod"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Appens mapp finns redan"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s"
@@ -267,51 +279,51 @@ msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkro
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder sedan"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "förra månaden"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "förra året"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år sedan"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index d2f922829336abe952ff345abee80485173d9652..bed6751c586bba7f14dd3fb5219241cb8aa89227 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-28 10:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -90,55 +90,59 @@ msgstr "Kan inte radera användare från gruppen %s"
msgid "Couldn't update app."
msgstr "Kunde inte uppdatera appen."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Uppdatera till {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivera"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivera"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Var god vänta..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Fel vid inaktivering av app"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Fel vid aktivering av app"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Uppdaterar..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Fel uppstod vid uppdatering av appen"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fel"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Uppdatera"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Sparar..."
@@ -154,16 +158,16 @@ msgstr "ångra"
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Radera"
@@ -183,7 +187,7 @@ msgstr "Fel vid skapande av användare"
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -349,11 +353,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -420,7 +424,7 @@ msgstr "Visa Första uppstarts-guiden igen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lösenord"
@@ -444,7 +448,7 @@ msgstr "Nytt lösenord"
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visningsnamn"
@@ -460,38 +464,66 @@ msgstr "Din e-postadress"
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Appen för kryptering är inte längre aktiverad, dekryptera alla dina filer"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Inloggningslösenord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekryptera alla filer"
@@ -517,30 +549,30 @@ msgstr "Enter the recovery password in order to recover the users files during p
msgid "Default Storage"
msgstr "Förvald lagring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Obegränsad"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annat"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Användarnamn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ändra visningsnamn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ange nytt lösenord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index fe62bebfde0d5f4177e66ced027f9d72d27758c9..48d8dddb418961bf77797590c90e943fba482198 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-28 11:40+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 1dec294805d308dc4fabe3c4a4878f0373b4f449..46d6c564324311463e94e4cca3cc0338209a53b6 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 8b725f24b816fd0680e60164c6010e3e3b2743be..1c9b03e91746b9fcfed38d9fa689055f1157d976 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index efcf28d104af4f21e32f06132c77650ce2adc5a5..4d21326ffb095541d28c285d4d59a40201d1a61d 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +442,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index c04debca1416693a8e4679b8d1f1ba4ac7e59d40..a9b2566a89e61176316e84167d47f09ca588795a 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "நீக்குவதற்கு எந்தப் பிரிவ
msgid "Error removing %s from favorites."
msgstr "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "ஞாயிற்றுக்கிழமை"
@@ -166,59 +186,59 @@ msgstr "கார்த்திகை"
msgid "December"
msgstr "மார்கழி"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "அமைப்புகள்"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "இன்று"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "நேற்று"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "கடந்த மாதம்"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "மாதங்களுக்கு முன்"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "கடந்த வருடம்"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
@@ -226,22 +246,26 @@ msgstr "வருடங்களுக்கு முன்"
msgid "Choose"
msgstr "தெரிவுசெய்க "
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "இல்லை"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "சரி"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr "பொருள் வகை குறிப்பிடப்படவ
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "வழு"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr "பகிர்வு"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "பகிரும் போதான வழு"
@@ -327,67 +351,67 @@ msgstr "காலாவதி தேதியை குறிப்பிடு
msgid "Expiration date"
msgstr "காலவதியாகும் திகதி"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "மின்னஞ்சலினூடான பகிர்வு: "
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "நபர்கள் யாரும் இல்லை"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "பகிரப்படாதது"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "பகிர்தல்"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "தனிப்பட்ட"
msgid "Users"
msgstr "பயனாளர்"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "செயலிகள்"
@@ -600,7 +624,7 @@ msgstr "அமைப்பை முடிக்க"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "விடுபதிகை செய்க"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 392dfada7d88ade4f17e70219fb90f526777a0ec..cb81b1d0b54c673cbc184ce03b6497fa2ea56440 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 6f439f6a08fa6f28f9065cab48d0cdb584edec95..73a4ffdeae2216a3af721432b985fbdf192806bc 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s கோப்புறையானது %s உடன் பகிர
msgid "%s shared the file %s with you"
msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "பதிவிறக்குக"
@@ -75,6 +75,6 @@ msgstr "பதிவேற்றுக"
msgid "Cancel upload"
msgstr "பதிவேற்றலை இரத்து செய்க"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 12cde4a741f979e7004e72eb11de435153326925..13095e3d78d5e693921bb875b2cac3fa9564c1b8 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "பயனாளர்"
msgid "Admin"
msgstr "நிர்வாகம்"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "இன்று"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "நேற்று"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "கடந்த மாதம்"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "கடந்த வருடம்"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6397e7f2b9f9226dbeb6237d10aa74653482fc8c..0e74f284b29fcbc0e7db083ded50ae7a77284b51 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "இயலுமைப்ப"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "இயலுமைப்படுத்துக"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "வழு"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "இற்றைப்படுத்தல்"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
@@ -148,16 +152,16 @@ msgstr "முன் செயல் நீக்கம் "
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "குழுக்கள்"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "குழு நிர்வாகி"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "நீக்குக"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_மொழி_பெயர்_"
@@ -343,11 +347,11 @@ msgstr "மேலதிக"
msgid "Less"
msgstr "குறைவான"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "கடவுச்சொல்"
@@ -438,7 +442,7 @@ msgstr "புதிய கடவுச்சொல்"
msgid "Change password"
msgstr "கடவுச்சொல்லை மாற்றுக"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "உங்களுடைய மின்னஞ்சல் முகவ
msgid "Fill in an email address to enable password recovery"
msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "மொழி"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "மொழிபெயர்க்க உதவி"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "மறைக்குறியீடு"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "மற்றவை"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "பயனாளர் பெயர்"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 971037c405620b2031ebfb6e0074cf203886f013..3df1b0da627ecdea4e62a9bc573600ef5760034e 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 2101fe896a75b46fabab34faa44ace085385cdd0..9c2ae9cdb2d674db4a9025f5534d21576f272ff3 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "ఆదివారం"
@@ -166,59 +186,59 @@ msgstr "నవంబర్"
msgid "December"
msgstr "డిసెంబర్"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "అమరికలు"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "ఈరోజు"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "నిన్న"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "నెలల క్రితం"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
@@ -226,22 +246,26 @@ msgstr "సంవత్సరాల క్రితం"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "కాదు"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "సరే"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "పొరపాటు"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +351,67 @@ msgstr ""
msgid "Expiration date"
msgstr "కాలం చెల్లు తేదీ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr ""
msgid "Users"
msgstr "వాడుకరులు"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,7 +624,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "నిష్క్రమించు"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index ed863a3da3141cba61a13e91a379f86a40829627..3e0c6d01743ab4c0b835e46676df25064db880b4 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 601b9e7b00e72dda1bb21486c30da78a4a3e6241..6bea113344d111d175a518dc14b4dd426ccdfa95 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "వాడుకరులు"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ఈరోజు"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "నిన్న"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "పోయిన నెల"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 13caf52b176a9acf81808ce853ecbdbe782ba227..38c9a149cc5b6b29498d03dc097877e49dcbc2c0 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "పొరపాటు"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "తొలగించు"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr "మరిన్ని"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "సంకేతపదం"
@@ -438,7 +442,7 @@ msgstr "కొత్త సంకేతపదం"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr "మీ ఈమెయిలు చిరునామా"
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "భాష"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "వాడుకరి పేరు"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index ae1d36e9c5978d7558ca86aaf8495fa616ae311a..f187c04b451425b5703ca92087e63f5819a919be 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4c0e3a677c29b56b8fad871b60c670243ef34a22..5f6e94f4ea7c2fabea2ac74c32a1759ed73bbcc3 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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"
@@ -91,6 +91,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -167,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -227,22 +247,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr ""
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -252,7 +276,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -272,7 +296,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -328,67 +352,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -403,7 +427,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -472,7 +496,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -601,7 +625,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 8e7a4df03e99ec71eddda51ca603b11566755e75..161d9755eb527b3e6ef8a52abe15ee81a72589a9 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:42-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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"
@@ -95,24 +95,24 @@ msgstr ""
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:73
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:167
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:241
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:246 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:278 js/file-upload.js:294 js/files.js:528 js/files.js:566
msgid "Error"
msgstr ""
@@ -128,57 +128,57 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:417 js/filelist.js:419
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:417 js/filelist.js:419
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:417
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:417 js/filelist.js:419
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:464
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:464
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:597
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:535 js/filelist.js:601 js/files.js:603
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:542
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:698
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
+#: js/filelist.js:763
msgid "files uploading"
msgstr ""
@@ -210,21 +210,21 @@ msgid ""
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:322
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:579 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:580 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:581 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -233,7 +233,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -269,65 +269,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b4ab99474a05eb28338e80b9b79fc3a0a3b1fe67..4ecbd811f4127c42627202e123e209718a9f231d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:42-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 780ae791813e228ba4c6318db8744b75a8f6d740..99b523228e48e51ad12c4d7f1c56c34b88b5e1f1 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index e5052a67c112f41913a1183a411f02e8c08b80c1..864993c2e536017f5c4a98bf1e29fe427d8e6dfb 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index c468f343d1994e57fe69fcead3ce5852f460e1e4..21e54096a87f05ff52d6b526e49db04a94ea8b54 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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"
@@ -44,21 +44,21 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:184 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
msgid "Name"
msgstr ""
-#: js/trash.js:185 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
msgstr ""
-#: js/trash.js:193
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/trash.js:199
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -72,11 +72,11 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
msgid "Restore"
msgstr ""
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 170cd574cb0068c03f4509464d986722f5219900..013e4ee266d2a9d315fa3722dcfefa8df10b25f5 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 802d246a6ac62a919dd4b8b9f165344a381b682b..662cfdfdd6c87b26f1574ec4bf4a5df0ff2b572c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:44-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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"
@@ -49,11 +49,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c5c3abed6cc97a0d1dff286f421fce96c436f1f4..e405f9529eab474b643d6026a057c3dddcfccb99 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:44-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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"
@@ -128,11 +128,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -342,11 +346,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -413,7 +417,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -437,7 +441,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -453,38 +457,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -510,30 +542,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 3990f5bce43ad7b7fef79b658601c2f304096246..28316ceea3bea6117f60329f2ae351c3ea8bbf73 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 8a84e0fe61a9521394397b0c1b4067016a128545..8f3c15b8d887ea0adcdbd6585fe35fb15b81d3fa 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"POT-Creation-Date: 2013-09-16 11:33-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 44071aa2ac3713c556056de6996a9aab41adb9f6..3ab10d3bf6f60a00e7e49014341e4ecce7361aa8 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "ยังไม่ได้เลือกหมวดหมู่ที
msgid "Error removing %s from favorites."
msgstr "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "วันอาทิตย์"
@@ -166,55 +186,55 @@ msgstr "พฤศจิกายน"
msgid "December"
msgstr "ธันวาคม"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "วันนี้"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "เดือน ที่ผ่านมา"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -222,22 +242,26 @@ msgstr "ปี ที่ผ่านมา"
msgid "Choose"
msgstr "เลือก"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "ไม่ตกลง"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "ตกลง"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr "ชนิดของวัตถุยังไม่ได้รับ
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ข้อผิดพลาด"
@@ -267,7 +291,7 @@ msgstr "แชร์แล้ว"
msgid "Share"
msgstr "แชร์"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
@@ -323,67 +347,67 @@ msgstr "กำหนดวันที่หมดอายุ"
msgid "Expiration date"
msgstr "วันที่หมดอายุ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "แชร์ผ่านทางอีเมล"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้องการ"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "ได้แชร์ {item} ให้กับ {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "สร้าง"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ลบ"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "แชร์"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "กำลังส่ง..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ส่งอีเมล์แล้ว"
@@ -398,7 +422,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "ส่วนตัว"
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "แอปฯ"
@@ -596,7 +620,7 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "ออกจากระบบ"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index beceaab6f50b415b98955614d3a68901d8e9caa6..2bb54ad25e0cff2b36e919490427ed1829c86d5c 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index ba9c49aba204c33f98e0be8c220f5c9f726152cd..467e3de3d83265550e0b8a6db3a32d7775407809 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับ
msgid "%s shared the file %s with you"
msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ดาวน์โหลด"
@@ -75,6 +75,6 @@ msgstr "อัพโหลด"
msgid "Cancel upload"
msgstr "ยกเลิกการอัพโหลด"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index e882a1fb160ab3430957a6fc9fb72e020b2e3ee1..0866886c95a29db613736faf3c0ae8288acbe72a 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ผู้ใช้งาน"
msgid "Admin"
msgstr "ผู้ดูแล"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "วันนี้"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ปีที่แล้ว"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index e08c6a264a2d8f436edebd6738268d0dbb6fdd55..3426744f01f0f33d67f4e8c0b3c32af1c5f09955 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ
msgid "Couldn't update app."
msgstr "ไม่สามารถอัพเดทแอปฯ"
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "อัพเดทไปเป็นรุ่น {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "ปิดใช้งาน"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "เปิดใช้งาน"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "กรุณารอสักครู่..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "กำลังอัพเดทข้อมูล..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "อัพเดท"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "อัพเดทแล้ว"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
@@ -148,16 +152,16 @@ msgstr "เลิกทำ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "กลุ่ม"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "ผู้ดูแลกลุ่ม"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "ลบ"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "ภาษาไทย"
@@ -343,11 +347,11 @@ msgstr "มาก"
msgid "Less"
msgstr "น้อย"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "แสดงหน้าจอวิซาร์ดนำทางคร
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "รหัสผ่าน"
@@ -438,7 +442,7 @@ msgstr "รหัสผ่านใหม่"
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "ชื่อที่ต้องการแสดง"
@@ -454,38 +458,66 @@ msgstr "ที่อยู่อีเมล์ของคุณ"
msgid "Fill in an email address to enable password recovery"
msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "ภาษา"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "ช่วยกันแปล"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "การเข้ารหัส"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ไม่จำกัดจำนวน"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "อื่นๆ"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ชื่อผู้ใช้งาน"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "พื้นที่จัดเก็บข้อมูล"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "เปลี่ยนชื่อที่ต้องการให้แสดง"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ตั้งค่ารหัสผ่านใหม่"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index d1f63c56b87e98e349adcfdb7fd141630f20d576..f1de28b8322e47778a326306ea5015c8e2f67ccc 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 3f86937276e68ec24dd7aa90a140770a34ee4ebf..eed4853b177a5797d9b5b2144b1d3060dd845631 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Fatih Aşıcı <fatih.asici@gmail.com>, 2013
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -30,28 +31,28 @@ msgstr "grup"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Bakım kipi etkinleştirildi"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Bakım kipi kapatıldı"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Veritabanı güncellendi"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Dosya önbelleği güncellendi"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "%%%d tamamlandı ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -92,6 +93,26 @@ msgstr "Silmek için bir kategori seçilmedi"
msgid "Error removing %s from favorites."
msgstr "%s favorilere çıkarılırken hata oluştu"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Pazar"
@@ -168,59 +189,59 @@ msgstr "Kasım"
msgid "December"
msgstr "Aralık"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n dakika önce"
msgstr[1] "%n dakika önce"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n saat önce"
msgstr[1] "%n saat önce"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "bugün"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "dün"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n gün önce"
msgstr[1] "%n gün önce"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ay önce"
msgstr[1] "%n ay önce"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "yıl önce"
@@ -228,22 +249,26 @@ msgstr "yıl önce"
msgid "Choose"
msgstr "seç"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Seçici şablon dosya yüklemesinde hata"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Tamam"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -253,7 +278,7 @@ msgstr "Nesne türü belirtilmemiş."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Hata"
@@ -273,7 +298,7 @@ msgstr "Paylaşılan"
msgid "Share"
msgstr "Paylaş"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata "
@@ -329,67 +354,67 @@ msgstr "Son kullanma tarihini ayarla"
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Eposta ile paylaş"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Tekrar paylaşmaya izin verilmiyor"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr " {item} içinde {user} ile paylaşılanlarlar"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "oluştur"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "güncelle"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "sil"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "paylaş"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Paralo korumalı"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Geçerlilik tarihi tanımlama hatası"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Eposta gönderildi"
@@ -404,7 +429,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s parola sıfırlama"
@@ -473,7 +498,7 @@ msgstr "Kişisel"
msgid "Users"
msgstr "Kullanıcılar"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Uygulamalar"
@@ -602,7 +627,7 @@ msgstr "Kurulumu tamamla"
msgid "%s is available. Get more information on how to update."
msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Çıkış yap"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 5fe275702b01554f72e5ca859b37501b57d9f8bc..e4878d5cdeec6dfe03cb4db1710db0702c56e4f9 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index a2ea28b6b5eebfcd98733eb019125894b57bb610..eea57d4dbd17455db191603b02c73da0f6b9023c 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s sizinle paylaşılan %s klasör"
msgid "%s shared the file %s with you"
msgstr "%s sizinle paylaşılan %s klasör"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "İndir"
@@ -75,6 +75,6 @@ msgstr "Yükle"
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Kullanılabilir önizleme yok"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 45e5b713bb1d7b3934795e39390950295a1c4301..7eadae253b4cf078dd3a613252170c34543cb254 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 11:40+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,11 +50,23 @@ msgstr "Kullanıcılar"
msgid "Admin"
msgstr "Yönetici"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" yükseltme başarısız oldu."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Bilgileriniz güvenli ve şifreli"
@@ -107,37 +119,37 @@ msgstr "%s arşiv tipi desteklenmiyor"
msgid "Failed to open archive when installing app"
msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Uygulama info.xml dosyası sağlamıyor"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Uygulamada izin verilmeyeden kodlar olduğu için kurulamıyor."
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Owncloud versiyonunuz ile uyumsuz olduğu için uygulama kurulamıyor."
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Uygulama kurulamıyor. Çünkü \"non shipped\" uygulamalar için <shipped>true</shipped> tag içermektedir."
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "Uygulama kurulamıyor çünkü info.xml/version ile uygulama marketde belirtilen sürüm aynı değil."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "App dizini zaten mevcut"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "app dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
@@ -266,51 +278,51 @@ msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırı
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "saniye önce"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n dakika önce"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n saat önce"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "bugün"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "dün"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n gün önce"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "geçen ay"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n ay önce"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "geçen yıl"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "yıl önce"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index ae9145f21209667cdd85ca6d0c10e13f9baf10a2..b7a8e8384978219c8cfe89cb55b010ce8c237763 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 00:50+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -88,55 +88,59 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor"
msgid "Couldn't update app."
msgstr "Uygulama güncellenemedi."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "{appversion} Güncelle"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Etkin değil"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Etkinleştir"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Lütfen bekleyin...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Uygulama devre dışı bırakılırken hata"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Uygulama etkinleştirilirken hata"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Güncelleniyor...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Uygulama güncellenirken hata"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Hata"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Güncelleme"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Kaydediliyor..."
@@ -152,16 +156,16 @@ msgstr "geri al"
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Sil"
@@ -181,7 +185,7 @@ msgstr "Kullanıcı oluşturulurken hata"
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Türkçe"
@@ -347,11 +351,11 @@ msgstr "Daha fazla"
msgid "Less"
msgstr "Az"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -418,7 +422,7 @@ msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parola"
@@ -442,7 +446,7 @@ msgstr "Yeni parola"
msgid "Change password"
msgstr "Parola değiştir"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Ekran Adı"
@@ -458,38 +462,66 @@ msgstr "Eposta adresiniz"
msgid "Fill in an email address to enable password recovery"
msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Dil"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için bu adresi kullanın"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Şifreleme"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Şifreleme uygulaması artık etkin değil, tüm dosyanın şifresini çöz"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Oturum açma parolası"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Tüm dosyaların şifresini çözme"
@@ -515,30 +547,30 @@ msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak içi
msgid "Default Storage"
msgstr "Varsayılan Depolama"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Limitsiz"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Diğer"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Kullanıcı Adı"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Depolama"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ekran adını değiştir"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "yeni parola belirle"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index b9254262c515d609e777a779e8aee3ce822b49f7..69f083c6084d9693ea62dfd15787b8e8035b941b 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 307adf559030a536c9e003e4d7d70f8eb41264c0..385f716e96f7d08d3bb0984f52bb91f48bcf1338 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "يەكشەنبە"
@@ -166,55 +186,55 @@ msgstr "ئوغلاق"
msgid "December"
msgstr "كۆنەك"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -222,22 +242,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "جەزملە"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خاتالىق"
@@ -267,7 +291,7 @@ msgstr ""
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +347,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "شەخسىي"
msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "ئەپلەر"
@@ -596,7 +620,7 @@ msgstr "تەڭشەك تامام"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "تىزىمدىن چىق"
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 2872d4e43e41a004ce7641f25d16929b03ddd0b3..3eabab5235bd4672fb550159aafb48f7a0bf069d 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "خاتالىق"
@@ -127,54 +127,54 @@ msgstr "مەڭگۈلۈك ئۆچۈر"
msgid "Rename"
msgstr "ئات ئۆزگەرت"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr "{new_name} مەۋجۇت"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr "ئالماشتۇر"
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr "تەۋسىيە ئات"
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr "ۋاز كەچ"
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr "يېنىۋال"
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
@@ -212,15 +212,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "ئاتى"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr "چوڭلۇقى"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr "ئۆزگەرتكەن"
@@ -297,33 +297,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "چۈشۈر"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "ئۆچۈر"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr "يۈكلەندىغىنى بەك چوڭ"
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index cf512bccd1913b01e7a7926aba7e2c24afe8a4c9..b1dd5be96431f8c3c289a6677d49f844799da575 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "چۈشۈر"
@@ -76,6 +76,6 @@ msgstr "يۈكلە"
msgid "Cancel upload"
msgstr "يۈكلەشتىن ۋاز كەچ"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index f9f9408227a9e91ede3ea1bfbb96032e16075cdc..27e9f375db1c396768f3d3eec1a09e1c43cea266 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 17:30+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ئىشلەتكۈچىلەر"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدە
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "بۈگۈن"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index c1174f807362b7f27b041416d8995760a10b9b4b..b6ec1cd7f02dd1adfc48519c75bc7715da969722 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 17:30+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -85,55 +85,59 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل
msgid "Couldn't update app."
msgstr "ئەپنى يېڭىلىيالمايدۇ."
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "{appversion} غا يېڭىلايدۇ"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "چەكلە"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "قوزغات"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "سەل كۈتۈڭ…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "يېڭىلاۋاتىدۇ…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خاتالىق"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "يېڭىلا"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "يېڭىلاندى"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
@@ -149,16 +153,16 @@ msgstr "يېنىۋال"
msgid "Unable to remove user"
msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "گۇرۇپپا"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "گۇرۇپپا باشقۇرغۇچى"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "ئۆچۈر"
@@ -178,7 +182,7 @@ msgstr "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈل
msgid "A valid password must be provided"
msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "ئۇيغۇرچە"
@@ -344,11 +348,11 @@ msgstr "تېخىمۇ كۆپ"
msgid "Less"
msgstr "ئاز"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "نەشرى"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "ئىم"
@@ -439,7 +443,7 @@ msgstr "يېڭى ئىم"
msgid "Change password"
msgstr "ئىم ئۆزگەرت"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "كۆرسىتىش ئىسمى"
@@ -455,38 +459,66 @@ msgstr "تورخەت ئادرېسىڭىز"
msgid "Fill in an email address to enable password recovery"
msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "تىل"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "تەرجىمىگە ياردەم"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "شىفىرلاش"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +544,30 @@ msgstr ""
msgid "Default Storage"
msgstr "كۆڭۈلدىكى ساقلىغۇچ"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "چەكسىز"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "باشقا"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ئىشلەتكۈچى ئاتى"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "ساقلىغۇچ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "يېڭى ئىم تەڭشە"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index fa2c51ddd269510b07fba7502ce72faa0e8f86bc..ad88262b4408b7769642bf47f73a452f0484688f 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 9467404002f231bf77676f486e8dfa9d2eb5b684..888399d1dc7544a3e9a15622b05fae7a59b87c90 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "Жодної категорії не обрано для видален
msgid "Error removing %s from favorites."
msgstr "Помилка при видалені %s із обраного."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Неділя"
@@ -166,63 +186,63 @@ msgstr "Листопад"
msgid "December"
msgstr "Грудень"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "сьогодні"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "місяці тому"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "минулого року"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "роки тому"
@@ -230,22 +250,26 @@ msgstr "роки тому"
msgid "Choose"
msgstr "Обрати"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ні"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -255,7 +279,7 @@ msgstr "Не визначено тип об'єкту."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Помилка"
@@ -275,7 +299,7 @@ msgstr "Опубліковано"
msgid "Share"
msgstr "Поділитися"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Помилка під час публікації"
@@ -331,67 +355,67 @@ msgstr "Встановити термін дії"
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Пере-публікація не дозволяється"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} для {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Закрити доступ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "створити"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "оновити"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "видалити"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "опублікувати"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Помилка при встановленні терміна дії"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Надсилання..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Ел. пошта надіслана"
@@ -406,7 +430,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +499,7 @@ msgstr "Особисте"
msgid "Users"
msgstr "Користувачі"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Додатки"
@@ -604,7 +628,7 @@ msgstr "Завершити налаштування"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Вихід"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index cd61a53093eefca81e689f1510116599f387c495..13cbcf246160f6c582047424af40f1eba7defd3b 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"Last-Translator: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr "Не вдалося перемістити %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Не вдалося встановити каталог завантаження."
#: ajax/upload.php:22
msgid "Invalid Token"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index a75abaf30c8a45fc3990fd9136521f422c965579..d36a9a3a538c816013d0761f230a0d01519cc369 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# zubr139 <zubr139@ukr.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 13:31+0000\n"
+"Last-Translator: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -129,7 +130,7 @@ msgstr ""
#: templates/settings-admin.php:53
msgid "Change Password"
-msgstr ""
+msgstr "Змінити Пароль"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 884b5932450e30d0a9530d1a4ff31d0010929fe9..c12dc78801e6908db1f52d7e7ec5c484f05e852c 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s опублікував каталог %s для Вас"
msgid "%s shared the file %s with you"
msgstr "%s опублікував файл %s для Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Завантажити"
@@ -75,6 +75,6 @@ msgstr "Вивантажити"
msgid "Cancel upload"
msgstr "Перервати завантаження"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Попередній перегляд недоступний для"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index cb5c568e21ba3b8b27884f83048aa3328290cacc..af53a22d88cb9fd219bc28c5c38d289bc92e9b64 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Користувачі"
msgid "Admin"
msgstr "Адмін"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "підконтрольні Вам веб-сервіси"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr "Ваш Web-сервер ще не налаштований належн
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "секунди тому"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "сьогодні"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчора"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "минулого місяця"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "минулого року"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "роки тому"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 8aaa83fd2a5a66d4e403791b9811110747996feb..3611f7952d7d08e74ea36df838f180d07b9eae09 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Не вдалося видалити користувача із гру
msgid "Couldn't update app."
msgstr "Не вдалося оновити програму. "
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Оновити до {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Вимкнути"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Включити"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Зачекайте, будь ласка..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Оновлюється..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Помилка при оновленні програми"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Помилка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Оновити"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Зберігаю..."
@@ -148,16 +152,16 @@ msgstr "відмінити"
msgid "Unable to remove user"
msgstr "Неможливо видалити користувача"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Групи"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Адміністратор групи"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Видалити"
@@ -177,7 +181,7 @@ msgstr "Помилка при створенні користувача"
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +347,11 @@ msgstr "Більше"
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версія"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "Показувати Майстер Налаштувань знову"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Пароль"
@@ -438,7 +442,7 @@ msgstr "Новий пароль"
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Показати Ім'я"
@@ -454,38 +458,66 @@ msgstr "Ваша адреса електронної пошти"
msgid "Fill in an email address to enable password recovery"
msgstr "Введіть адресу електронної пошти для відновлення паролю"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Мова"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифрування"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "сховище за замовчуванням"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Необмежено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Інше"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Ім'я користувача"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Сховище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "змінити зображене ім'я"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "встановити новий пароль"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 9f05e0918b780403b87b3976fc791babcf18015e..db0bfc141d0820d12cc2c7b998b3530946ed537d 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index b4c80edd14eed51962e97feaf726d6a7aa60adac..b25b14fad21794e1691f012d96be7d2c3772c6d4 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -5,14 +5,15 @@
# Translators:
# skoptev <skoptev@ukr.net>, 2012
# volodya327 <volodya327@gmail.com>, 2012
+# zubr139 <zubr139@ukr.net>, 2013
# volodya327 <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 13:52+0000\n"
+"Last-Translator: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Аутентифікація WebDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Адреса:"
#: templates/settings.php:7
msgid ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 4e063c006816ddbae90b158bdb46a50ae53226b1..5e22263ec5f195d9870042214b7f3ed7d3f7294a 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب ن
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr ""
@@ -166,59 +186,59 @@ msgstr "نومبر"
msgid "December"
msgstr "دسمبر"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "سیٹینگز"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -226,22 +246,26 @@ msgstr ""
msgid "Choose"
msgstr "منتخب کریں"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "نہیں"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "اوکے"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +275,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ایرر"
@@ -271,7 +295,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "شئیرنگ کے دوران ایرر"
@@ -327,67 +351,67 @@ msgstr "تاریخ معیاد سیٹ کریں"
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "کوئی لوگ نہیں ملے۔"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ایڈٹ کر سکے"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +426,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +495,7 @@ msgstr "ذاتی"
msgid "Users"
msgstr "یوزرز"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "ایپز"
@@ -600,7 +624,7 @@ msgstr "سیٹ اپ ختم کریں"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "لاگ آؤٹ"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 6880222c4ce145a89ba35099537beb0eab24af9f..0d12edb3665e285b629c75f93f6e3b74a6c61bf5 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index ac5dc324885da9fd4455c2607136f40e7351d749..a5cf0b44cdd18161b7c33329cd10e221934c0281 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "یوزرز"
msgid "Admin"
msgstr "ایڈمن"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "آپ کے اختیار میں ویب سروسیز"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 256bc2a51e79d2bab17b0892c37312f27e5e8b6f..4c01294a252e75369accd6f3357c9999cc88ed31 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ایرر"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr ""
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "پاسورڈ"
@@ -438,7 +442,7 @@ msgstr "نیا پاسورڈ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "یوزر نیم"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 085620de421b1ab441081fc90ba5f205b413bd07..fd54d8167be69059178e9dae354e051f6118616f 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index dda5098f3cb36b751b94b0825792ce45b51da69c..6cdb4d2458ee60d967844ac8c673f8f8b1cef041 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,26 @@ msgstr "Bạn chưa chọn mục để xóa"
msgid "Error removing %s from favorites."
msgstr "Lỗi xóa %s từ mục yêu thích."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Chủ nhật"
@@ -167,55 +187,55 @@ msgstr "Tháng 11"
msgid "December"
msgstr "Tháng 12"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "vài giây trước"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "hôm nay"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "năm trước"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "năm trước"
@@ -223,22 +243,26 @@ msgstr "năm trước"
msgid "Choose"
msgstr "Chọn"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Đồng ý"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -248,7 +272,7 @@ msgstr "Loại đối tượng không được chỉ định."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Lỗi"
@@ -268,7 +292,7 @@ msgstr "Được chia sẻ"
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
@@ -324,67 +348,67 @@ msgstr "Đặt ngày kết thúc"
msgid "Expiration date"
msgstr "Ngày kết thúc"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Không tìm thấy người nào"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Đã được chia sẽ trong {item} với {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "tạo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "cập nhật"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "xóa"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Lỗi không thiết lập ngày kết thúc"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngày kết thúc"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Đang gởi ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email đã được gửi"
@@ -399,7 +423,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +492,7 @@ msgstr "Cá nhân"
msgid "Users"
msgstr "Người dùng"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Ứng dụng"
@@ -597,7 +621,7 @@ msgstr "Cài đặt hoàn tất"
msgid "%s is available. Get more information on how to update."
msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Đăng xuất"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index bba27b3142c86a128c1cf6079755f727817917f6..ffc9063f5d7a4b0037a498de9c73bc04ba9fd648 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 9d990191532f720dea46f3cd64eb3f9c500ff453..f370ab63c638bbcedf46b588a96cf960d7d03c40 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "%s đã chia sẻ thư mục %s với bạn"
msgid "%s shared the file %s with you"
msgstr "%s đã chia sẻ tập tin %s với bạn"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Tải về"
@@ -75,6 +75,6 @@ msgstr "Tải lên"
msgid "Cancel upload"
msgstr "Hủy upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Không có xem trước cho"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index bce957d996a177d321e3adc0ebded1e2923add99..7ad119bbb6f4c4e07e9b5dca4da105078be0a9a3 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Người dùng"
msgid "Admin"
msgstr "Quản trị"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "dịch vụ web dưới sự kiểm soát của bạn"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "vài giây trước"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hôm nay"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "hôm qua"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "tháng trước"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "năm trước"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "năm trước"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 13a831ade8c878775e3fd09005d30b57da377641..1297da2664f428b91b8b082c06b79501989e4de5 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr "Không thể xóa người dùng từ nhóm %s"
msgid "Couldn't update app."
msgstr "Không thể cập nhật ứng dụng"
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Cập nhật lên {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Tắt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Bật"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Xin hãy đợi..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Đang cập nhật..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Lỗi khi cập nhật ứng dụng"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Lỗi"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Cập nhật"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Đã cập nhật"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Đang lưu..."
@@ -148,16 +152,16 @@ msgstr "lùi lại"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Xóa"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
@@ -343,11 +347,11 @@ msgstr "hơn"
msgid "Less"
msgstr "ít"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Mật khẩu"
@@ -438,7 +442,7 @@ msgstr "Mật khẩu mới"
msgid "Change password"
msgstr "Đổi mật khẩu"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Tên hiển thị"
@@ -454,38 +458,66 @@ msgstr "Email của bạn"
msgid "Fill in an email address to enable password recovery"
msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Ngôn ngữ"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hỗ trợ dịch thuật"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Bộ nhớ mặc định"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Không giới hạn"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Khác"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Tên đăng nhập"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Bộ nhớ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Thay đổi tên hiển thị"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "đặt mật khẩu mới"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 350cf0c3a2d9ac8cdcf13be48904ac62b2027c8e..e926fbc3d814a460c44c703901d495b2f86ca7e7 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 450b37558761abd1d6ae814efc64f82d243bb8ef..8d4cdaa172a2016fe1139062a181d1e949112ddb 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -93,6 +93,26 @@ msgstr "没有选择要删除的类别"
msgid "Error removing %s from favorites."
msgstr "从收藏夹中移除%s时出错。"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "星期日"
@@ -169,55 +189,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "设置"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "今天"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "上月"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "月前"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "去年"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "年前"
@@ -225,22 +245,26 @@ msgstr "年前"
msgid "Choose"
msgstr "选择(&C)..."
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "加载文件选择器模板出错"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "好"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -250,7 +274,7 @@ msgstr "未指定对象类型。"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "错误"
@@ -270,7 +294,7 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "共享时出错"
@@ -326,67 +350,67 @@ msgstr "设置过期日期"
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "访问控制"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "创建"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "删除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "共享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "邮件已发送"
@@ -401,7 +425,7 @@ msgstr "更新不成功。请汇报将此问题汇报给 <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功。正在重定向至 ownCloud。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "重置 %s 的密码"
@@ -470,7 +494,7 @@ msgstr "个人"
msgid "Users"
msgstr "用户"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "应用"
@@ -599,7 +623,7 @@ msgstr "安装完成"
msgid "%s is available. Get more information on how to update."
msgstr "%s 可用。获取更多关于如何升级的信息。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "注销"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index a61fb2a34d3414b7354ae4a3f2518944e1b0b861..e68d22da13a3f9de93649ffdbb140c62e0bdd3d6 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-08-30 13:50+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index b526299a397531047ef2ccd81da76c9633dec2e1..5887baf02b772940017e9cd9541265a1dfbb96d0 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: waterone <suiy02@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s与您共享了%s文件夹"
msgid "%s shared the file %s with you"
msgstr "%s与您共享了%s文件"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "下载"
@@ -76,6 +76,6 @@ msgstr "上传"
msgid "Cancel upload"
msgstr "取消上传"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "没有预览"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 08447c650f0a0e2c4fb71c5fc21cdfc5f7db4d6c..6d3267bb037b7503b67651a12faacbc3a6001caf 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 19:10+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (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"
@@ -51,11 +51,23 @@ msgstr "用户"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "您控制的web服务"
@@ -108,37 +120,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "应用未提供 info.xml 文件"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -267,47 +279,47 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指南</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "秒前"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今天"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "上月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "去年"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "年前"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index d8d9cefc362200d99cf2893a1a7566f3dfa0fcf0..f6c57de60cb255f4c32408b7b3c80c0f74c6e76e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-28 06:22-0400\n"
-"PO-Revision-Date: 2013-08-27 17:40+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (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"
@@ -89,55 +89,59 @@ msgstr "无法从组%s中移除用户"
msgid "Couldn't update app."
msgstr "无法更新 app。"
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "更新至 {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "禁用"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "开启"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "请稍等...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "禁用 app 时出错"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "启用 app 时出错"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "正在更新...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "更新 app 时出错"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "错误"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "更新"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "正在解密文件... 请稍等，可能需要一些时间。"
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "保存中"
@@ -153,16 +157,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "组"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "删除"
@@ -182,7 +186,7 @@ msgstr "创建用户出错"
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "简体中文"
@@ -348,11 +352,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "版本"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -419,7 +423,7 @@ msgstr "再次显示首次运行向导"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密码"
@@ -443,7 +447,7 @@ msgstr "新密码"
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "显示名称"
@@ -459,38 +463,66 @@ msgstr "您的电子邮件"
msgid "Fill in an email address to enable password recovery"
msgstr "填写电子邮件地址以启用密码恢复功能"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "语言"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "加密 app 未启用，将解密您所有文件"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "登录密码"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "解密所有文件"
@@ -516,30 +548,30 @@ msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
msgid "Default Storage"
msgstr "默认存储"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "无限"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "其它"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "用户名"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "存储"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "修改显示名称"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "设置新密码"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index f10526434317ec306a4cf380251a4ad18a317421..22c5379e5583a28d4df5f7f74a25bc90ef38d22e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 13d575a3d0ccd24c52192956c32906d9885cd1be..51efb5c3cf65be439d639b50111817287217e1b4 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-30 13:33+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -90,6 +90,26 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "星期日"
@@ -166,55 +186,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "今日"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "前一月"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "個月之前"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr ""
@@ -222,22 +242,26 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -247,7 +271,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "錯誤"
@@ -267,7 +291,7 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -323,67 +347,67 @@ msgstr "設定分享期限"
msgid "Expiration date"
msgstr "分享期限"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "找不到"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "新增"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "刪除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "分享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "密碼保護"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "傳送中"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "郵件已傳"
@@ -398,7 +422,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功, 正"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +491,7 @@ msgstr "個人"
msgid "Users"
msgstr "用戶"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "軟件"
@@ -596,7 +620,7 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "登出"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 32b94a8ffc990ecdf6007b48f6adf1391d729fd5..ef901a270fc65148fcece1dcd9a45d1b5c5d65af 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
msgid "Error"
msgstr "錯誤"
@@ -127,54 +127,54 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:307
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:307 js/filelist.js:309
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:354
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:432
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:563
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
+#: js/filelist.js:628
msgid "files uploading"
msgstr ""
@@ -212,15 +212,15 @@ msgid ""
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:563 templates/index.php:69
msgid "Name"
msgstr "名稱"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:564 templates/index.php:81
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:565 templates/index.php:83
msgid "Modified"
msgstr ""
@@ -297,33 +297,33 @@ msgstr ""
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:75
msgid "Download"
msgstr "下載"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:88 templates/index.php:89
msgid "Unshare"
msgstr "取消分享"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:94 templates/index.php:95
msgid "Delete"
msgstr "刪除"
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:110
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:115
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:118
msgid "Current scanning"
msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 1ab84440f23185ee1b49999ad15ced6eb00d8357..51163c90a96fc9d5a74c504f1953cc33cc6e1a61 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "下載"
@@ -75,6 +75,6 @@ msgstr "上傳"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c6fa7c451a4730ec05c79eb3aa3a987447331a9f..22b7a3e57b444982c02df99d10fd597ec151f0e6 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "用戶"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr ""
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今日"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨日"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "前一月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 3d0d5b1326567bffaadcb70ff4cdb41fe16061ed..ac0290157fb287f42a32fda3d9b86dc8b5fc2fdc 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -84,55 +84,59 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "錯誤"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr ""
@@ -148,16 +152,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "群組"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "刪除"
@@ -177,7 +181,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +347,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +418,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密碼"
@@ -438,7 +442,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +458,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
msgstr ""
#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +543,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "用戶名稱"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 98bb432413746d2df62d08ec4410b77283fa8f28..ecd9fd8d4c154f9e1f70e3b65127f0bcd972b167 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 2a689d6fc8fe8ab8ab8a9b481f18f46578289e54..405447f8111abb7cf4055e81344d4c6833d104aa 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 13:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -92,6 +92,26 @@ msgstr "沒有選擇要刪除的分類。"
msgid "Error removing %s from favorites."
msgstr "從最愛移除 %s 時發生錯誤。"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "週日"
@@ -168,55 +188,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:853
msgid "seconds ago"
msgstr "幾秒前"
-#: js/js.js:813
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: js/js.js:814
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: js/js.js:815
+#: js/js.js:856
msgid "today"
msgstr "今天"
-#: js/js.js:816
+#: js/js.js:857
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:817
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:818
+#: js/js.js:859
msgid "last month"
msgstr "上個月"
-#: js/js.js:819
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: js/js.js:820
+#: js/js.js:861
msgid "months ago"
msgstr "幾個月前"
-#: js/js.js:821
+#: js/js.js:862
msgid "last year"
msgstr "去年"
-#: js/js.js:822
+#: js/js.js:863
msgid "years ago"
msgstr "幾年前"
@@ -224,22 +244,26 @@ msgstr "幾年前"
msgid "Choose"
msgstr "選擇"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "載入檔案選擇器樣板發生錯誤"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "好"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -249,7 +273,7 @@ msgstr "未指定物件類型。"
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "錯誤"
@@ -269,7 +293,7 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -325,67 +349,67 @@ msgstr "指定到期日"
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "透過電子郵件分享："
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "不允許重新分享"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "存取控制"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "建立"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "刪除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "分享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "受密碼保護"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "取消到期日設定失敗"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "設定到期日發生錯誤"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "正在傳送…"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email 已寄出"
@@ -400,7 +424,7 @@ msgstr "升級失敗，請將此問題回報 <a href=\"https://github.com/ownclo
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "升級成功，正將您重新導向至 ownCloud 。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s 密碼重設"
@@ -469,7 +493,7 @@ msgstr "個人"
msgid "Users"
msgstr "使用者"
-#: strings.php:7 templates/layout.user.php:105
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "應用程式"
@@ -598,7 +622,7 @@ msgstr "完成設定"
msgid "%s is available. Get more information on how to update."
msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "登出"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 260d80d6bf56302415a6d0e1941c94b154f2527c..cc65168506e663d1fb9a2b1b481f275b768a1a1e 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 13:20+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:00+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 59f0e459f57519a711d0f9cc66ac50bacdebc4aa..c59207bb90f5153f16dd173ed0198a244f376717 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 13:20+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 9f1a0e4503917db4c0bba5b568825182417853f0..93ad380deccaf74ddc2b3367432b2dad41a69807 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 04:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,11 +49,23 @@ msgstr "使用者"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "升級失敗：%s"
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
#: defaults.php:35
msgid "web services under your control"
msgstr "由您控制的網路服務"
@@ -106,37 +118,37 @@ msgstr "不支援 %s 格式的壓縮檔"
msgid "Failed to open archive when installing app"
msgstr "安裝應用程式時無法開啓壓縮檔"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "應用程式沒有提供 info.xml 檔案"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "無法安裝應用程式因為在當中找到危險的代碼"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "無法安裝應用程式因為它和此版本的 ownCloud 不相容。"
-#: installer.php:144
+#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的"
-#: installer.php:150
+#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
msgstr "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "應用程式目錄已經存在"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "無法建立應用程式目錄，請檢查權限：%s"
@@ -265,47 +277,47 @@ msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "請參考<a href='%s'>安裝指南</a>。"
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "幾秒前"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今天"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "上個月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "去年"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "幾年前"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 5bda63d03bdb179d7f382f2451b7d5a474ee700a..207a0b4670bc35c5399f1a79cca929f6d0b5c1ca 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-01 13:27-0400\n"
-"PO-Revision-Date: 2013-09-01 14:00+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -129,11 +129,15 @@ msgstr "更新"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:150
+#: js/personal.js:217
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:262
msgid "Decrypting files... Please wait, this can take some time."
msgstr "檔案解密中，請稍候。"
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "儲存中..."
@@ -149,16 +153,16 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "群組"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "群組管理員"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "刪除"
@@ -178,7 +182,7 @@ msgstr "建立用戶時出現錯誤"
msgid "A valid password must be provided"
msgstr "一定要提供一個有效的密碼"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +348,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "版本"
-#: templates/admin.php:246 templates/personal.php:143
+#: templates/admin.php:246 templates/personal.php:164
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +419,7 @@ msgstr "再次顯示首次使用精靈"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密碼"
@@ -439,7 +443,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "顯示名稱"
@@ -455,38 +459,66 @@ msgstr "您的電子郵件信箱"
msgid "Fill in an email address to enable password recovery"
msgstr "請填入電子郵件信箱以便回復密碼"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "語言"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "幫助翻譯"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: templates/personal.php:127
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "以上的 WebDAV 位址可以讓您<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">透過 WebDAV 協定存取檔案</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "加密應用程式已經停用，請您解密您所有的檔案"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "登入密碼"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "解密所有檔案"
@@ -512,30 +544,30 @@ msgstr "為了修改密碼時能夠取回使用者資料，請輸入另一組還
msgid "Default Storage"
msgstr "預設儲存區"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "無限制"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "其他"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "使用者名稱"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "儲存區"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "修改顯示名稱"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "設定新密碼"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index fd00e191fde285bf38477f3357baed051acb1b66..50beca64ee57462303b741967abc63e8fd033ee8 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:10+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/app.php b/lib/app.php
index 8f5dd1d685ee6f8a7b250717812d69644c2fad74..d98af2dc29688956d2a531a5851973b2ccd65299 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -73,11 +73,11 @@ class OC_App{
if (!defined('DEBUG') || !DEBUG) {
if (is_null($types)
- && empty(OC_Util::$core_scripts)
- && empty(OC_Util::$core_styles)) {
- OC_Util::$core_scripts = OC_Util::$scripts;
+ && empty(OC_Util::$coreScripts)
+ && empty(OC_Util::$coreStyles)) {
+ OC_Util::$coreScripts = OC_Util::$scripts;
OC_Util::$scripts = array();
- OC_Util::$core_styles = OC_Util::$styles;
+ OC_Util::$coreStyles = OC_Util::$styles;
OC_Util::$styles = array();
}
}
@@ -667,14 +667,16 @@ class OC_App{
}
$dh = opendir( $apps_dir['path'] );
- while (($file = readdir($dh)) !== false) {
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
- if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
+ if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
- $apps[] = $file;
+ $apps[] = $file;
- }
+ }
+ }
}
}
@@ -868,10 +870,10 @@ class OC_App{
/**
- * Compares the app version with the owncloud version to see if the app
+ * Compares the app version with the owncloud version to see if the app
* requires a newer version than the currently active one
* @param array $owncloudVersions array with 3 entries: major minor bugfix
- * @param string $appRequired the required version from the xml
+ * @param string $appRequired the required version from the xml
* major.minor.bugfix
* @return boolean true if compatible, otherwise false
*/
diff --git a/lib/appframework/app.php b/lib/appframework/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ff55bb809d1ddcfeef1142547878a8fcf3e1805
--- /dev/null
+++ b/lib/appframework/app.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+use OCP\AppFramework\IAppContainer;
+
+
+/**
+ * Entry point for every request in your app. You can consider this as your
+ * public static void main() method
+ *
+ * Handles all the dependency injection, controllers and output flow
+ */
+class App {
+
+
+ /**
+ * Shortcut for calling a controller method and printing the result
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ * @param DIContainer $container an instance of a pimple container.
+ */
+ public static function main($controllerName, $methodName, array $urlParams,
+ IAppContainer $container) {
+ $container['urlParams'] = $urlParams;
+ $controller = $container[$controllerName];
+
+ // initialize the dispatcher and run all the middleware before the controller
+ $dispatcher = $container['Dispatcher'];
+
+ list($httpHeaders, $responseHeaders, $output) =
+ $dispatcher->dispatch($controller, $methodName);
+
+ if(!is_null($httpHeaders)) {
+ header($httpHeaders);
+ }
+
+ foreach($responseHeaders as $name => $value) {
+ header($name . ': ' . $value);
+ }
+
+ if(!is_null($output)) {
+ header('Content-Length: ' . strlen($output));
+ print($output);
+ }
+
+ }
+
+ /**
+ * Shortcut for calling a controller method and printing the result.
+ * Similar to App:main except that no headers will be sent.
+ * This should be used for example when registering sections via
+ * \OC\AppFramework\Core\API::registerAdmin()
+ *
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ * @param DIContainer $container an instance of a pimple container.
+ */
+ public static function part($controllerName, $methodName, array $urlParams,
+ DIContainer $container){
+
+ $container['urlParams'] = $urlParams;
+ $controller = $container[$controllerName];
+
+ $dispatcher = $container['Dispatcher'];
+
+ list(, , $output) = $dispatcher->dispatch($controller, $methodName);
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7498ba0e1e7c579b706449d217e0f88c4c16ac2
--- /dev/null
+++ b/lib/appframework/controller/controller.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Controller;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Core\API;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+/**
+ * Base class to inherit your controllers from
+ */
+abstract class Controller {
+
+ /**
+ * @var API instance of the api layer
+ */
+ protected $api;
+
+ protected $request;
+
+ /**
+ * @param API $api an api wrapper instance
+ * @param Request $request an instance of the request
+ */
+ public function __construct(API $api, Request $request){
+ $this->api = $api;
+ $this->request = $request;
+ }
+
+
+ /**
+ * Lets you access post and get parameters by the index
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function params($key, $default=null){
+ return $this->request->getParam($key, $default);
+ }
+
+
+ /**
+ * Returns all params that were received, be it from the request
+ * (as GET or POST) or throuh the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams() {
+ return $this->request->getParams();
+ }
+
+
+ /**
+ * Returns the method of the request
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function method() {
+ return $this->request->getMethod();
+ }
+
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key) {
+ return $this->request->getUploadedFile($key);
+ }
+
+
+ /**
+ * Shortcut for getting env variables
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function env($key) {
+ return $this->request->getEnv($key);
+ }
+
+
+ /**
+ * Shortcut for getting session variables
+ * @param string $key the key that will be taken from the $_SESSION array
+ * @return array the value in the $_SESSION element
+ */
+ public function session($key) {
+ return $this->request->getSession($key);
+ }
+
+
+ /**
+ * Shortcut for getting cookie variables
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ public function cookie($key) {
+ return $this->request->getCookie($key);
+ }
+
+
+ /**
+ * Shortcut for rendering a template
+ * @param string $templateName the name of the template
+ * @param array $params the template parameters in key => value structure
+ * @param string $renderAs user renders a full page, blank only your template
+ * admin an entry in the admin settings
+ * @param array $headers set additional headers in name/value pairs
+ * @return \OCP\AppFramework\Http\TemplateResponse containing the page
+ */
+ public function render($templateName, array $params=array(),
+ $renderAs='user', array $headers=array()){
+ $response = new TemplateResponse($this->api, $templateName);
+ $response->setParams($params);
+ $response->renderAs($renderAs);
+
+ foreach($headers as $name => $value){
+ $response->addHeader($name, $value);
+ }
+
+ return $response;
+ }
+
+
+}
diff --git a/lib/appframework/core/api.php b/lib/appframework/core/api.php
new file mode 100644
index 0000000000000000000000000000000000000000..337e3b57d6d6ac29efd504eef348dd22ebeb5f34
--- /dev/null
+++ b/lib/appframework/core/api.php
@@ -0,0 +1,525 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Core;
+use OCP\AppFramework\IApi;
+
+
+/**
+ * This is used to wrap the owncloud static api calls into an object to make the
+ * code better abstractable for use in the dependency injection container
+ *
+ * Should you find yourself in need for more methods, simply inherit from this
+ * class and add your methods
+ */
+class API implements IApi{
+
+ private $appName;
+
+ /**
+ * constructor
+ * @param string $appName the name of your application
+ */
+ public function __construct($appName){
+ $this->appName = $appName;
+ }
+
+
+ /**
+ * used to return the appname of the set application
+ * @return string the name of your application
+ */
+ public function getAppName(){
+ return $this->appName;
+ }
+
+
+ /**
+ * Creates a new navigation entry
+ * @param array $entry containing: id, name, order, icon and href key
+ */
+ public function addNavigationEntry(array $entry){
+ \OCP\App::addNavigationEntry($entry);
+ }
+
+
+ /**
+ * Gets the userid of the current user
+ * @return string the user id of the current user
+ */
+ public function getUserId(){
+ return \OCP\User::getUser();
+ }
+
+
+ /**
+ * Sets the current navigation entry to the currently running app
+ */
+ public function activateNavigationEntry(){
+ \OCP\App::setActiveNavigationEntry($this->appName);
+ }
+
+
+ /**
+ * Adds a new javascript file
+ * @param string $scriptName the name of the javascript in js/ without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function addScript($scriptName, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ \OCP\Util::addScript($appName, $scriptName);
+ }
+
+
+ /**
+ * Adds a new css file
+ * @param string $styleName the name of the css file in css/without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function addStyle($styleName, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ \OCP\Util::addStyle($appName, $styleName);
+ }
+
+
+ /**
+ * shorthand for addScript for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ public function add3rdPartyScript($name){
+ \OCP\Util::addScript($this->appName . '/3rdparty', $name);
+ }
+
+
+ /**
+ * shorthand for addStyle for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ public function add3rdPartyStyle($name){
+ \OCP\Util::addStyle($this->appName . '/3rdparty', $name);
+ }
+
+ /**
+ * Looks up a systemwide defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getSystemValue($key){
+ return \OCP\Config::getSystemValue($key, '');
+ }
+
+
+ /**
+ * Sets a new systemwide value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ public function setSystemValue($key, $value){
+ return \OCP\Config::setSystemValue($key, $value);
+ }
+
+
+ /**
+ * Looks up an appwide defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getAppValue($key, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Config::getAppValue($appName, $key, '');
+ }
+
+
+ /**
+ * Writes a new appwide value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ public function setAppValue($key, $value, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Config::setAppValue($appName, $key, $value);
+ }
+
+
+
+ /**
+ * Shortcut for setting a user defined value
+ * @param string $key the key under which the value is being stored
+ * @param string $value the value that you want to store
+ * @param string $userId the userId of the user that we want to store the value under, defaults to the current one
+ */
+ public function setUserValue($key, $value, $userId=null){
+ if($userId === null){
+ $userId = $this->getUserId();
+ }
+ \OCP\Config::setUserValue($userId, $this->appName, $key, $value);
+ }
+
+
+ /**
+ * Shortcut for getting a user defined value
+ * @param string $key the key under which the value is being stored
+ * @param string $userId the userId of the user that we want to store the value under, defaults to the current one
+ */
+ public function getUserValue($key, $userId=null){
+ if($userId === null){
+ $userId = $this->getUserId();
+ }
+ return \OCP\Config::getUserValue($userId, $this->appName, $key);
+ }
+
+
+ /**
+ * Returns the translation object
+ * @return \OC_L10N the translation object
+ */
+ public function getTrans(){
+ # TODO: use public api
+ return \OC_L10N::get($this->appName);
+ }
+
+
+ /**
+ * 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 \OCP\DB a query object
+ */
+ 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);
+ }
+
+
+ /**
+ * Returns the URL for a route
+ * @param string $routeName the name of the route
+ * @param array $arguments an array with arguments which will be filled into the url
+ * @return string the url
+ */
+ public function linkToRoute($routeName, $arguments=array()){
+ return \OCP\Util::linkToRoute($routeName, $arguments);
+ }
+
+
+ /**
+ * Returns an URL for an image or file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function linkTo($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::linkTo($appName, $file);
+ }
+
+
+ /**
+ * Returns the link to an image, like link to but only with prepending img/
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function imagePath($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::imagePath($appName, $file);
+ }
+
+
+ /**
+ * Makes an URL absolute
+ * @param string $url the url
+ * @return string the absolute url
+ */
+ public function getAbsoluteURL($url){
+ # TODO: use public api
+ return \OC_Helper::makeURLAbsolute($url);
+ }
+
+
+ /**
+ * links to a file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ * @deprecated replaced with linkToRoute()
+ * @return string the url
+ */
+ public function linkToAbsolute($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::linkToAbsolute($appName, $file);
+ }
+
+
+ /**
+ * Checks if the current user is logged in
+ * @return bool true if logged in
+ */
+ public function isLoggedIn(){
+ return \OCP\User::isLoggedIn();
+ }
+
+
+ /**
+ * Checks if a user is an admin
+ * @param string $userId the id of the user
+ * @return bool true if admin
+ */
+ public function isAdminUser($userId){
+ # TODO: use public api
+ return \OC_User::isAdminUser($userId);
+ }
+
+
+ /**
+ * Checks if a user is an subadmin
+ * @param string $userId the id of the user
+ * @return bool true if subadmin
+ */
+ public function isSubAdminUser($userId){
+ # TODO: use public api
+ return \OC_SubAdmin::isSubAdmin($userId);
+ }
+
+
+ /**
+ * Checks if the CSRF check was correct
+ * @return bool true if CSRF check passed
+ */
+ public function passesCSRFCheck(){
+ # TODO: use public api
+ return \OC_Util::isCallRegistered();
+ }
+
+
+ /**
+ * Checks if an app is enabled
+ * @param string $appName the name of an app
+ * @return bool true if app is enabled
+ */
+ public function isAppEnabled($appName){
+ return \OCP\App::isEnabled($appName);
+ }
+
+
+ /**
+ * Writes a function into the error log
+ * @param string $msg the error message to be logged
+ * @param int $level the error level
+ */
+ public function log($msg, $level=null){
+ switch($level){
+ case 'debug':
+ $level = \OCP\Util::DEBUG;
+ break;
+ case 'info':
+ $level = \OCP\Util::INFO;
+ break;
+ case 'warn':
+ $level = \OCP\Util::WARN;
+ break;
+ case 'fatal':
+ $level = \OCP\Util::FATAL;
+ break;
+ default:
+ $level = \OCP\Util::ERROR;
+ break;
+ }
+ \OCP\Util::writeLog($this->appName, $msg, $level);
+ }
+
+
+ /**
+ * Returns a template
+ * @param string $templateName the name of the template
+ * @param string $renderAs how it should be rendered
+ * @param string $appName the name of the app
+ * @return \OCP\Template a new template
+ */
+ public function getTemplate($templateName, $renderAs='user', $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+
+ if($renderAs === 'blank'){
+ return new \OCP\Template($appName, $templateName);
+ } else {
+ return new \OCP\Template($appName, $templateName, $renderAs);
+ }
+ }
+
+
+ /**
+ * turns an owncloud path into a path on the filesystem
+ * @param string path the path to the file on the oc filesystem
+ * @return string the filepath in the filesystem
+ */
+ public function getLocalFilePath($path){
+ # TODO: use public api
+ return \OC_Filesystem::getLocalFile($path);
+ }
+
+
+ /**
+ * used to return and open a new eventsource
+ * @return \OC_EventSource a new open EventSource class
+ */
+ public function openEventSource(){
+ # TODO: use public api
+ return new \OC_EventSource();
+ }
+
+ /**
+ * @brief connects a function to a hook
+ * @param string $signalClass class name of emitter
+ * @param string $signalName name of signal
+ * @param string $slotClass class name of slot
+ * @param string $slotName name of slot, in another word, this is the
+ * name of the method that will be called when registered
+ * signal is emitted.
+ * @return bool, always true
+ */
+ public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+ return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
+ }
+
+ /**
+ * @brief Emits a signal. To get data from the slot use references!
+ * @param string $signalClass class name of emitter
+ * @param string $signalName name of signal
+ * @param array $params defautl: array() array with additional data
+ * @return bool, true if slots exists or false if not
+ */
+ public function emitHook($signalClass, $signalName, $params = array()) {
+ return \OCP\Util::emitHook($signalClass, $signalName, $params);
+ }
+
+ /**
+ * @brief clear hooks
+ * @param string $signalClass
+ * @param string $signalName
+ */
+ public function clearHook($signalClass=false, $signalName=false) {
+ if ($signalClass) {
+ \OC_Hook::clear($signalClass, $signalName);
+ }
+ }
+
+ /**
+ * Gets the content of an URL by using CURL or a fallback if it is not
+ * installed
+ * @param string $url the url that should be fetched
+ * @return string the content of the webpage
+ */
+ public function getUrlContent($url) {
+ return \OC_Util::getUrlContent($url);
+ }
+
+ /**
+ * Register a backgroundjob task
+ * @param string $className full namespace and class name of the class
+ * @param string $methodName the name of the static method that should be
+ * called
+ */
+ public function addRegularTask($className, $methodName) {
+ \OCP\Backgroundjob::addRegularTask($className, $methodName);
+ }
+
+ /**
+ * Tells ownCloud to include a template in the admin overview
+ * @param string $mainPath the path to the main php file without the php
+ * suffix, relative to your apps directory! not the template directory
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function registerAdmin($mainPath, $appName=null) {
+ if($appName === null){
+ $appName = $this->appName;
+ }
+
+ \OCP\App::registerAdmin($appName, $mainPath);
+ }
+
+ /**
+ * Do a user login
+ * @param string $user the username
+ * @param string $password the password
+ * @return bool true if successful
+ */
+ public function login($user, $password) {
+ return \OC_User::login($user, $password);
+ }
+
+ /**
+ * @brief Loggs the user out including all the session data
+ * Logout, destroys session
+ */
+ public function logout() {
+ return \OCP\User::logout();
+ }
+
+ /**
+ * get the filesystem info
+ *
+ * @param string $path
+ * @return array with the following keys:
+ * - size
+ * - mtime
+ * - mimetype
+ * - encrypted
+ * - versioned
+ */
+ public function getFileInfo($path) {
+ return \OC\Files\Filesystem::getFileInfo($path);
+ }
+
+ /**
+ * get the view
+ *
+ * @return OC\Files\View instance
+ */
+ public function getView() {
+ return \OC\Files\Filesystem::getView();
+ }
+}
diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ef885d7b2ca7f628807ae5fc7ceaf199d4cdac9
--- /dev/null
+++ b/lib/appframework/dependencyinjection/dicontainer.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\DependencyInjection;
+
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\Dispatcher;
+use OC\AppFramework\Core\API;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OC\AppFramework\Middleware\Security\SecurityMiddleware;
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\AppFramework\Utility\TimeFactory;
+use OCP\AppFramework\IApi;
+use OCP\AppFramework\IAppContainer;
+
+
+class DIContainer extends SimpleContainer implements IAppContainer{
+
+
+ /**
+ * Put your class dependencies in here
+ * @param string $appName the name of the app
+ */
+ public function __construct($appName){
+
+ $this['AppName'] = $appName;
+
+ $this->registerParameter('ServerContainer', \OC::$server);
+
+ $this['API'] = $this->share(function($c){
+ return new API($c['AppName']);
+ });
+
+ /**
+ * Http
+ */
+ $this['Request'] = $this->share(function($c) {
+
+ $params = array();
+
+ // we json decode the body only in case of content type json
+ if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) {
+ $params = json_decode(file_get_contents('php://input'), true);
+ $params = is_array($params) ? $params: array();
+ }
+
+ return new Request(
+ array(
+ 'get' => $_GET,
+ 'post' => $_POST,
+ 'files' => $_FILES,
+ 'server' => $_SERVER,
+ 'env' => $_ENV,
+ 'session' => $_SESSION,
+ 'cookies' => $_COOKIE,
+ 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+ ? $_SERVER['REQUEST_METHOD']
+ : null,
+ 'params' => $params,
+ 'urlParams' => $c['urlParams']
+ )
+ );
+ });
+
+ $this['Protocol'] = $this->share(function($c){
+ if(isset($_SERVER['SERVER_PROTOCOL'])) {
+ return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
+ } else {
+ return new Http($_SERVER);
+ }
+ });
+
+ $this['Dispatcher'] = $this->share(function($c) {
+ return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']);
+ });
+
+
+ /**
+ * Middleware
+ */
+ $this['SecurityMiddleware'] = $this->share(function($c){
+ return new SecurityMiddleware($c['API'], $c['Request']);
+ });
+
+ $this['MiddlewareDispatcher'] = $this->share(function($c){
+ $dispatcher = new MiddlewareDispatcher();
+ $dispatcher->registerMiddleware($c['SecurityMiddleware']);
+
+ return $dispatcher;
+ });
+
+
+ /**
+ * Utilities
+ */
+ $this['TimeFactory'] = $this->share(function($c){
+ return new TimeFactory();
+ });
+
+
+ }
+
+
+ /**
+ * @return IApi
+ */
+ function getCoreApi()
+ {
+ return $this->query('API');
+ }
+
+ /**
+ * @return \OCP\IServerContainer
+ */
+ function getServer()
+ {
+ return $this->query('ServerContainer');
+ }
+}
diff --git a/lib/appframework/http/dispatcher.php b/lib/appframework/http/dispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea57a6860cc27ea4fa4b3c9c8f8ba0a8a8db7666
--- /dev/null
+++ b/lib/appframework/http/dispatcher.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use \OC\AppFramework\Controller\Controller;
+use \OC\AppFramework\Middleware\MiddlewareDispatcher;
+
+
+/**
+ * Class to dispatch the request to the middleware dispatcher
+ */
+class Dispatcher {
+
+ private $middlewareDispatcher;
+ private $protocol;
+
+
+ /**
+ * @param Http $protocol the http protocol with contains all status headers
+ * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
+ * runs the middleware
+ */
+ public function __construct(Http $protocol,
+ MiddlewareDispatcher $middlewareDispatcher) {
+ $this->protocol = $protocol;
+ $this->middlewareDispatcher = $middlewareDispatcher;
+ }
+
+
+ /**
+ * Handles a request and calls the dispatcher on the controller
+ * @param Controller $controller the controller which will be called
+ * @param string $methodName the method name which will be called on
+ * the controller
+ * @return array $array[0] contains a string with the http main header,
+ * $array[1] contains headers in the form: $key => value, $array[2] contains
+ * the response output
+ */
+ public function dispatch(Controller $controller, $methodName) {
+ $out = array(null, array(), null);
+
+ try {
+
+ $this->middlewareDispatcher->beforeController($controller,
+ $methodName);
+ $response = $controller->$methodName();
+
+ // if an exception appears, the middleware checks if it can handle the
+ // exception and creates a response. If no response is created, it is
+ // assumed that theres no middleware who can handle it and the error is
+ // thrown again
+ } catch(\Exception $exception){
+ $response = $this->middlewareDispatcher->afterException(
+ $controller, $methodName, $exception);
+ if (is_null($response)) {
+ throw $exception;
+ }
+ }
+
+ $response = $this->middlewareDispatcher->afterController(
+ $controller, $methodName, $response);
+
+ // get the output which should be printed and run the after output
+ // middleware to modify the response
+ $output = $response->render();
+ $out[2] = $this->middlewareDispatcher->beforeOutput(
+ $controller, $methodName, $output);
+
+ // depending on the cache object the headers need to be changed
+ $out[0] = $this->protocol->getStatusHeader($response->getStatus(),
+ $response->getLastModified(), $response->getETag());
+ $out[1] = $response->getHeaders();
+
+ return $out;
+ }
+
+
+}
diff --git a/lib/appframework/http/downloadresponse.php b/lib/appframework/http/downloadresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..67b9542dba6956dc9ef919b809edf5195917a6e7
--- /dev/null
+++ b/lib/appframework/http/downloadresponse.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+/**
+ * Prompts the user to download the a file
+ */
+class DownloadResponse extends \OCP\AppFramework\Http\Response {
+
+ private $filename;
+ private $contentType;
+
+ /**
+ * Creates a response that prompts the user to download the file
+ * @param string $filename the name that the downloaded file should have
+ * @param string $contentType the mimetype that the downloaded file should have
+ */
+ public function __construct($filename, $contentType) {
+ $this->filename = $filename;
+ $this->contentType = $contentType;
+
+ $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+ $this->addHeader('Content-Type', $contentType);
+ }
+
+
+}
diff --git a/lib/appframework/http/http.php b/lib/appframework/http/http.php
new file mode 100644
index 0000000000000000000000000000000000000000..e00dc9cdc4a2514a34e13e958cd904fd8e858952
--- /dev/null
+++ b/lib/appframework/http/http.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+class Http extends \OCP\AppFramework\Http\Http{
+
+ private $server;
+ private $protocolVersion;
+ protected $headers;
+
+ /**
+ * @param $_SERVER $server
+ * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+ */
+ public function __construct($server, $protocolVersion='HTTP/1.1') {
+ $this->server = $server;
+ $this->protocolVersion = $protocolVersion;
+
+ $this->headers = array(
+ self::STATUS_CONTINUE => 'Continue',
+ self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+ self::STATUS_PROCESSING => 'Processing',
+ self::STATUS_OK => 'OK',
+ self::STATUS_CREATED => 'Created',
+ self::STATUS_ACCEPTED => 'Accepted',
+ self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+ self::STATUS_NO_CONTENT => 'No Content',
+ self::STATUS_RESET_CONTENT => 'Reset Content',
+ self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+ self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+ self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+ self::STATUS_IM_USED => 'IM Used', // RFC 3229
+ self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+ self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+ self::STATUS_FOUND => 'Found',
+ self::STATUS_SEE_OTHER => 'See Other',
+ self::STATUS_NOT_MODIFIED => 'Not Modified',
+ self::STATUS_USE_PROXY => 'Use Proxy',
+ self::STATUS_RESERVED => 'Reserved',
+ self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+ self::STATUS_BAD_REQUEST => 'Bad request',
+ self::STATUS_UNAUTHORIZED => 'Unauthorized',
+ self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+ self::STATUS_FORBIDDEN => 'Forbidden',
+ self::STATUS_NOT_FOUND => 'Not Found',
+ self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+ self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+ self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+ self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+ self::STATUS_CONFLICT => 'Conflict',
+ self::STATUS_GONE => 'Gone',
+ self::STATUS_LENGTH_REQUIRED => 'Length Required',
+ self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+ self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+ self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+ self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+ self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+ self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+ self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+ self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+ self::STATUS_LOCKED => 'Locked', // RFC 4918
+ self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+ self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+ self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+ self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+ self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+ self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+ self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+ self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+ self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+ self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+ self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+ self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+ self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+ self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+ self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+ self::STATUS_NOT_EXTENDED => 'Not extended',
+ self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+ );
+ }
+
+
+ /**
+ * Gets the correct header
+ * @param Http::CONSTANT $status the constant from the Http class
+ * @param \DateTime $lastModified formatted last modified date
+ * @param string $Etag the etag
+ */
+ public function getStatusHeader($status, \DateTime $lastModified=null,
+ $ETag=null) {
+
+ if(!is_null($lastModified)) {
+ $lastModified = $lastModified->format(\DateTime::RFC2822);
+ }
+
+ // if etag or lastmodified have not changed, return a not modified
+ if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+ && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag)
+
+ ||
+
+ (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+ && trim($this->server['HTTP_IF_MODIFIED_SINCE']) ===
+ $lastModified)) {
+
+ $status = self::STATUS_NOT_MODIFIED;
+ }
+
+ // we have one change currently for the http 1.0 header that differs
+ // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+ // if this differs any more, we want to create childclasses for this
+ if($status === self::STATUS_TEMPORARY_REDIRECT
+ && $this->protocolVersion === 'HTTP/1.0') {
+
+ $status = self::STATUS_FOUND;
+ }
+
+ return $this->protocolVersion . ' ' . $status . ' ' .
+ $this->headers[$status];
+ }
+
+
+}
+
+
diff --git a/lib/appframework/http/redirectresponse.php b/lib/appframework/http/redirectresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..688447f16180c2943a704cad0c95009d1d627841
--- /dev/null
+++ b/lib/appframework/http/redirectresponse.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Redirects to a different URL
+ */
+class RedirectResponse extends Response {
+
+ private $redirectURL;
+
+ /**
+ * Creates a response that redirects to a url
+ * @param string $redirectURL the url to redirect to
+ */
+ public function __construct($redirectURL) {
+ $this->redirectURL = $redirectURL;
+ $this->setStatus(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->addHeader('Location', $redirectURL);
+ }
+
+
+ /**
+ * @return string the url to redirect
+ */
+ public function getRedirectURL() {
+ return $this->redirectURL;
+ }
+
+
+}
diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f1775182a1e89da5b23d5656a7644d1dbdc3357
--- /dev/null
+++ b/lib/appframework/http/request.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * ownCloud - Request
+ *
+ * @author Thomas Tanghus
+ * @copyright 2013 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\AppFramework\Http;
+
+use OCP\IRequest;
+
+/**
+ * Class for accessing variables in the request.
+ * This class provides an immutable object with request variables.
+ */
+
+class Request implements \ArrayAccess, \Countable, IRequest {
+
+ protected $items = array();
+ protected $allowedKeys = array(
+ 'get',
+ 'post',
+ 'files',
+ 'server',
+ 'env',
+ 'session',
+ 'cookies',
+ 'urlParams',
+ 'params',
+ 'parameters',
+ 'method'
+ );
+
+ /**
+ * @param array $vars An associative array with the following optional values:
+ * @param array 'params' the parsed json array
+ * @param array 'urlParams' the parameters which were matched from the URL
+ * @param array 'get' the $_GET array
+ * @param array 'post' the $_POST array
+ * @param array 'files' the $_FILES array
+ * @param array 'server' the $_SERVER array
+ * @param array 'env' the $_ENV array
+ * @param array 'session' the $_SESSION array
+ * @param array 'cookies' the $_COOKIE array
+ * @param string 'method' the request method (GET, POST etc)
+ * @see http://www.php.net/manual/en/reserved.variables.php
+ */
+ public function __construct(array $vars=array()) {
+
+ foreach($this->allowedKeys as $name) {
+ $this->items[$name] = isset($vars[$name])
+ ? $vars[$name]
+ : array();
+ }
+
+ $this->items['parameters'] = array_merge(
+ $this->items['params'],
+ $this->items['get'],
+ $this->items['post'],
+ $this->items['urlParams']
+ );
+
+ }
+
+ // Countable method.
+ public function count() {
+ return count(array_keys($this->items['parameters']));
+ }
+
+ /**
+ * ArrayAccess methods
+ *
+ * Gives access to the combined GET, POST and urlParams arrays
+ *
+ * Examples:
+ *
+ * $var = $request['myvar'];
+ *
+ * or
+ *
+ * if(!isset($request['myvar']) {
+ * // Do something
+ * }
+ *
+ * $request['myvar'] = 'something'; // This throws an exception.
+ *
+ * @param string $offset The key to lookup
+ * @return string|null
+ */
+ public function offsetExists($offset) {
+ return isset($this->items['parameters'][$offset]);
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetGet($offset) {
+ return isset($this->items['parameters'][$offset])
+ ? $this->items['parameters'][$offset]
+ : null;
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetSet($offset, $value) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetUnset($offset) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ // Magic property accessors
+ public function __set($name, $value) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * Access request variables by method and name.
+ * Examples:
+ *
+ * $request->post['myvar']; // Only look for POST variables
+ * $request->myvar; or $request->{'myvar'}; or $request->{$myvar}
+ * Looks in the combined GET, POST and urlParams array.
+ *
+ * if($request->method !== 'POST') {
+ * throw new Exception('This function can only be invoked using POST');
+ * }
+ *
+ * @param string $name The key to look for.
+ * @return mixed|null
+ */
+ public function __get($name) {
+ switch($name) {
+ case 'get':
+ case 'post':
+ case 'files':
+ case 'server':
+ case 'env':
+ case 'session':
+ case 'cookies':
+ case 'parameters':
+ case 'params':
+ case 'urlParams':
+ return isset($this->items[$name])
+ ? $this->items[$name]
+ : null;
+ break;
+ case 'method':
+ return $this->items['method'];
+ break;
+ default;
+ return isset($this[$name])
+ ? $this[$name]
+ : null;
+ break;
+ }
+ }
+
+
+ public function __isset($name) {
+ return isset($this->items['parameters'][$name]);
+ }
+
+
+ public function __unset($id) {
+ throw new \RunTimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * Returns the value for a specific http header.
+ *
+ * This method returns null if the header did not exist.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function getHeader($name) {
+
+ $name = strtoupper(str_replace(array('-'),array('_'),$name));
+ if (isset($this->server['HTTP_' . $name])) {
+ return $this->server['HTTP_' . $name];
+ }
+
+ // There's a few headers that seem to end up in the top-level
+ // server array.
+ switch($name) {
+ case 'CONTENT_TYPE' :
+ case 'CONTENT_LENGTH' :
+ if (isset($this->server[$name])) {
+ return $this->server[$name];
+ }
+ break;
+
+ }
+
+ return null;
+ }
+
+ /**
+ * Lets you access post and get parameters by the index
+ * In case of json requests the encoded json body is accessed
+ *
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function getParam($key, $default = null)
+ {
+ return isset($this->parameters[$key])
+ ? $this->parameters[$key]
+ : $default;
+ }
+
+ /**
+ * Returns all params that were received, be it from the request
+ * (as GET or POST) or throuh the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams()
+ {
+ return $this->parameters;
+ }
+
+ /**
+ * Returns the method of the request
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function getMethod()
+ {
+ return $this->method;
+ }
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key)
+ {
+ return isset($this->files[$key]) ? $this->files[$key] : null;
+ }
+
+ /**
+ * Shortcut for getting env variables
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function getEnv($key)
+ {
+ return isset($this->env[$key]) ? $this->env[$key] : null;
+ }
+
+ /**
+ * Shortcut for getting session variables
+ * @param string $key the key that will be taken from the $_SESSION array
+ * @return array the value in the $_SESSION element
+ */
+ function getSession($key)
+ {
+ return isset($this->session[$key]) ? $this->session[$key] : null;
+ }
+
+ /**
+ * Shortcut for getting cookie variables
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ function getCookie($key)
+ {
+ return isset($this->cookies[$key]) ? $this->cookies[$key] : null;
+ }
+
+ /**
+ * Returns the request body content.
+ *
+ * @param Boolean $asResource If true, a resource will be returned
+ *
+ * @return string|resource The request body content or a resource to read the body stream.
+ *
+ * @throws \LogicException
+ */
+ function getContent($asResource = false)
+ {
+ return null;
+// if (false === $this->content || (true === $asResource && null !== $this->content)) {
+// throw new \LogicException('getContent() can only be called once when using the resource return type.');
+// }
+//
+// if (true === $asResource) {
+// $this->content = false;
+//
+// return fopen('php://input', 'rb');
+// }
+//
+// if (null === $this->content) {
+// $this->content = file_get_contents('php://input');
+// }
+//
+// return $this->content;
+ }
+}
diff --git a/lib/appframework/middleware/middleware.php b/lib/appframework/middleware/middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..b12c03c3eb8da3627077f148679bc5d8aa8dd09e
--- /dev/null
+++ b/lib/appframework/middleware/middleware.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware;
+
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Middleware is used to provide hooks before or after controller methods and
+ * deal with possible exceptions raised in the controller methods.
+ * They're modeled after Django's middleware system:
+ * https://docs.djangoproject.com/en/dev/topics/http/middleware/
+ */
+abstract class Middleware {
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ public function beforeController($controller, $methodName){
+
+ }
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is
+ * asked in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object in case that the exception was handled
+ */
+ public function afterException($controller, $methodName, \Exception $exception){
+ throw $exception;
+ }
+
+
+ /**
+ * This is being run after a successful controllermethod call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ public function afterController($controller, $methodName, Response $response){
+ return $response;
+ }
+
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ public function beforeOutput($controller, $methodName, $output){
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/appframework/middleware/middlewaredispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ab108e6b884d8404504a2db5bc246c3c2aa578
--- /dev/null
+++ b/lib/appframework/middleware/middlewaredispatcher.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware;
+
+use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * This class is used to store and run all the middleware in correct order
+ */
+class MiddlewareDispatcher {
+
+ /**
+ * @var array array containing all the middlewares
+ */
+ private $middlewares;
+
+ /**
+ * @var int counter which tells us what middlware was executed once an
+ * exception occurs
+ */
+ private $middlewareCounter;
+
+
+ /**
+ * Constructor
+ */
+ public function __construct(){
+ $this->middlewares = array();
+ $this->middlewareCounter = 0;
+ }
+
+
+ /**
+ * Adds a new middleware
+ * @param Middleware $middleware the middleware which will be added
+ */
+ public function registerMiddleware(Middleware $middleWare){
+ array_push($this->middlewares, $middleWare);
+ }
+
+
+ /**
+ * returns an array with all middleware elements
+ * @return array the middlewares
+ */
+ public function getMiddlewares(){
+ return $this->middlewares;
+ }
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ public function beforeController(Controller $controller, $methodName){
+ // we need to count so that we know which middlewares we have to ask in
+ // case theres an exception
+ for($i=0; $i<count($this->middlewares); $i++){
+ $this->middlewareCounter++;
+ $middleware = $this->middlewares[$i];
+ $middleware->beforeController($controller, $methodName);
+ }
+ }
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is asked
+ * in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @return Response a Response object if the middleware can handle the
+ * exception
+ * @throws \Exception the passed in exception if it cant handle it
+ */
+ public function afterException(Controller $controller, $methodName, \Exception $exception){
+ for($i=$this->middlewareCounter-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ try {
+ return $middleware->afterException($controller, $methodName, $exception);
+ } catch(\Exception $exception){
+ continue;
+ }
+ }
+ throw $exception;
+ }
+
+
+ /**
+ * This is being run after a successful controllermethod call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ public function afterController(Controller $controller, $methodName, Response $response){
+ for($i=count($this->middlewares)-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ $response = $middleware->afterController($controller, $methodName, $response);
+ }
+ return $response;
+ }
+
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ public function beforeOutput(Controller $controller, $methodName, $output){
+ for($i=count($this->middlewares)-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ $output = $middleware->beforeOutput($controller, $methodName, $output);
+ }
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/middleware/security/securityexception.php b/lib/appframework/middleware/security/securityexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..b32a2769ff5c3975e2ee5545fccceaad8d61215b
--- /dev/null
+++ b/lib/appframework/middleware/security/securityexception.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+
+/**
+ * Thrown when the security middleware encounters a security problem
+ */
+class SecurityException extends \Exception {
+
+ /**
+ * @param string $msg the security error message
+ * @param bool $ajax true if it resulted because of an ajax request
+ */
+ public function __construct($msg, $code = 0) {
+ parent::__construct($msg, $code);
+ }
+
+}
diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/appframework/middleware/security/securitymiddleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f1447e1afba11ffea26f40792be80c392b053b3
--- /dev/null
+++ b/lib/appframework/middleware/security/securitymiddleware.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Controller\Controller;
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\RedirectResponse;
+use OC\AppFramework\Utility\MethodAnnotationReader;
+use OC\AppFramework\Middleware\Middleware;
+use OC\AppFramework\Core\API;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\JSONResponse;
+
+
+/**
+ * Used to do all the authentication and checking stuff for a controller method
+ * It reads out the annotations of a controller method and checks which if
+ * security things should be checked and also handles errors in case a security
+ * check fails
+ */
+class SecurityMiddleware extends Middleware {
+
+ private $api;
+
+ /**
+ * @var \OC\AppFramework\Http\Request
+ */
+ private $request;
+
+ /**
+ * @param API $api an instance of the api
+ */
+ public function __construct(API $api, Request $request){
+ $this->api = $api;
+ $this->request = $request;
+ }
+
+
+ /**
+ * This runs all the security checks before a method call. The
+ * security checks are determined by inspecting the controller method
+ * annotations
+ * @param string/Controller $controller the controllername or string
+ * @param string $methodName the name of the method
+ * @throws SecurityException when a security check fails
+ */
+ public function beforeController($controller, $methodName){
+
+ // get annotations from comments
+ $annotationReader = new MethodAnnotationReader($controller, $methodName);
+
+ // this will set the current navigation entry of the app, use this only
+ // for normal HTML requests and not for AJAX requests
+ $this->api->activateNavigationEntry();
+
+ // security checks
+ $isPublicPage = $annotationReader->hasAnnotation('PublicPage');
+ if(!$isPublicPage) {
+ if(!$this->api->isLoggedIn()) {
+ throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
+ }
+
+ if(!$annotationReader->hasAnnotation('NoAdminRequired')) {
+ if(!$this->api->isAdminUser($this->api->getUserId())) {
+ throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
+ }
+ }
+ }
+
+ if(!$annotationReader->hasAnnotation('NoCSRFRequired')) {
+ if(!$this->api->passesCSRFCheck()) {
+ throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
+ }
+ }
+
+ }
+
+
+ /**
+ * If an SecurityException is being caught, ajax requests return a JSON error
+ * response and non ajax requests redirect to the index
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object or null in case that the exception could not be handled
+ */
+ public function afterException($controller, $methodName, \Exception $exception){
+ if($exception instanceof SecurityException){
+
+ if (stripos($this->request->getHeader('Accept'),'html')===false) {
+
+ $response = new JSONResponse(
+ array('message' => $exception->getMessage()),
+ $exception->getCode()
+ );
+ $this->api->log($exception->getMessage(), 'debug');
+ } else {
+
+ $url = $this->api->linkToAbsolute('index.php', ''); // TODO: replace with link to route
+ $response = new RedirectResponse($url);
+ $this->api->log($exception->getMessage(), 'debug');
+ }
+
+ return $response;
+
+ }
+
+ throw $exception;
+ }
+
+}
diff --git a/lib/appframework/routing/routeactionhandler.php b/lib/appframework/routing/routeactionhandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..7fb56f14eab7db7395b0bd4dcd70ed1812f32a44
--- /dev/null
+++ b/lib/appframework/routing/routeactionhandler.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\AppFramework\routing;
+
+use \OC\AppFramework\App;
+use \OC\AppFramework\DependencyInjection\DIContainer;
+
+class RouteActionHandler {
+ private $controllerName;
+ private $actionName;
+ private $container;
+
+ public function __construct(DIContainer $container, $controllerName, $actionName) {
+ $this->controllerName = $controllerName;
+ $this->actionName = $actionName;
+ $this->container = $container;
+ }
+
+ public function __invoke($params) {
+ App::main($this->controllerName, $this->actionName, $params, $this->container);
+ }
+}
diff --git a/lib/appframework/routing/routeconfig.php b/lib/appframework/routing/routeconfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..53ab11bf2f599770d0d8f2bce8a0a97400fb4d24
--- /dev/null
+++ b/lib/appframework/routing/routeconfig.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\AppFramework\routing;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+
+/**
+ * Class RouteConfig
+ * @package OC\AppFramework\routing
+ */
+class RouteConfig {
+ private $container;
+ private $router;
+ private $routes;
+ private $appName;
+
+ /**
+ * @param \OC\AppFramework\DependencyInjection\DIContainer $container
+ * @param \OC_Router $router
+ * @param string $pathToYml
+ * @internal param $appName
+ */
+ public function __construct(DIContainer $container, \OC_Router $router, $routes) {
+ $this->routes = $routes;
+ $this->container = $container;
+ $this->router = $router;
+ $this->appName = $container['AppName'];
+ }
+
+ /**
+ * The routes and resource will be registered to the \OC_Router
+ */
+ public function register() {
+
+ // parse simple
+ $this->processSimpleRoutes($this->routes);
+
+ // parse resources
+ $this->processResources($this->routes);
+ }
+
+ /**
+ * Creates one route base on the give configuration
+ * @param $routes
+ * @throws \UnexpectedValueException
+ */
+ private function processSimpleRoutes($routes)
+ {
+ $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
+ foreach ($simpleRoutes as $simpleRoute) {
+ $name = $simpleRoute['name'];
+ $url = $simpleRoute['url'];
+ $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
+
+ $split = explode('#', $name, 2);
+ if (count($split) != 2) {
+ throw new \UnexpectedValueException('Invalid route name');
+ }
+ $controller = $split[0];
+ $action = $split[1];
+
+ $controllerName = $this->buildControllerName($controller);
+ $actionName = $this->buildActionName($action);
+
+ // register the route
+ $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+ $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)->method($verb)->action($handler);
+ }
+ }
+
+ /**
+ * For a given name and url restful routes are created:
+ * - index
+ * - show
+ * - new
+ * - create
+ * - update
+ * - destroy
+ *
+ * @param $routes
+ */
+ private function processResources($routes)
+ {
+ // declaration of all restful actions
+ $actions = array(
+ array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
+ array('name' => 'show', 'verb' => 'GET'),
+ array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
+ array('name' => 'update', 'verb' => 'PUT'),
+ array('name' => 'destroy', 'verb' => 'DELETE'),
+ );
+
+ $resources = isset($routes['resources']) ? $routes['resources'] : array();
+ foreach ($resources as $resource => $config) {
+
+ // the url parameter used as id to the resource
+ $resourceId = $this->buildResourceId($resource);
+ foreach($actions as $action) {
+ $url = $config['url'];
+ $method = $action['name'];
+ $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
+ $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
+ if (!$collectionAction) {
+ $url = $url . '/' . $resourceId;
+ }
+ if (isset($action['url-postfix'])) {
+ $url = $url . '/' . $action['url-postfix'];
+ }
+
+ $controller = $resource;
+
+ $controllerName = $this->buildControllerName($controller);
+ $actionName = $this->buildActionName($method);
+
+ $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+
+ $this->router->create($routeName, $url)->method($verb)->action(
+ new RouteActionHandler($this->container, $controllerName, $actionName)
+ );
+ }
+ }
+ }
+
+ /**
+ * Based on a given route name the controller name is generated
+ * @param $controller
+ * @return string
+ */
+ private function buildControllerName($controller)
+ {
+ return $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+ }
+
+ /**
+ * Based on the action part of the route name the controller method name is generated
+ * @param $action
+ * @return string
+ */
+ private function buildActionName($action) {
+ return $this->underScoreToCamelCase($action);
+ }
+
+ /**
+ * Generates the id used in the url part o the route url
+ * @param $resource
+ * @return string
+ */
+ private function buildResourceId($resource) {
+ return '{'.$this->underScoreToCamelCase(rtrim($resource, 's')).'Id}';
+ }
+
+ /**
+ * Underscored strings are converted to camel case strings
+ * @param $str string
+ * @return string
+ */
+ private function underScoreToCamelCase($str) {
+ $pattern = "/_[a-z]?/";
+ return preg_replace_callback(
+ $pattern,
+ function ($matches) {
+ return strtoupper(ltrim($matches[0], "_"));
+ },
+ $str);
+ }
+}
diff --git a/lib/appframework/utility/methodannotationreader.php b/lib/appframework/utility/methodannotationreader.php
new file mode 100644
index 0000000000000000000000000000000000000000..42060a0852987206de1d023df0b51654149022ca
--- /dev/null
+++ b/lib/appframework/utility/methodannotationreader.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+/**
+ * Reads and parses annotations from doc comments
+ */
+class MethodAnnotationReader {
+
+ private $annotations;
+
+ /**
+ * @param object $object an object or classname
+ * @param string $method the method which we want to inspect for annotations
+ */
+ public function __construct($object, $method){
+ $this->annotations = array();
+
+ $reflection = new \ReflectionMethod($object, $method);
+ $docs = $reflection->getDocComment();
+
+ // extract everything prefixed by @ and first letter uppercase
+ preg_match_all('/@([A-Z]\w+)/', $docs, $matches);
+ $this->annotations = $matches[1];
+ }
+
+
+ /**
+ * Check if a method contains an annotation
+ * @param string $name the name of the annotation
+ * @return bool true if the annotation is found
+ */
+ public function hasAnnotation($name){
+ return in_array($name, $this->annotations);
+ }
+
+
+}
diff --git a/lib/appframework/utility/simplecontainer.php b/lib/appframework/utility/simplecontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..a51ace83a3759fb73b3f75b8455301ba5075f549
--- /dev/null
+++ b/lib/appframework/utility/simplecontainer.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace OC\AppFramework\Utility;
+
+// register 3rdparty autoloaders
+require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
+
+/**
+ * Class SimpleContainer
+ *
+ * SimpleContainer is a simple implementation of IContainer on basis of \Pimple
+ */
+class SimpleContainer extends \Pimple implements \OCP\IContainer {
+
+ /**
+ * @param string $name name of the service to query for
+ * @return object registered service for the given $name
+ */
+ public function query($name) {
+ return $this->offsetGet($name);
+ }
+
+ function registerParameter($name, $value)
+ {
+ $this[$name] = $value;
+ }
+
+ /**
+ * The given closure is call the first time the given service is queried.
+ * The closure has to return the instance for the given service.
+ * Created instance will be cached in case $shared is true.
+ *
+ * @param string $name name of the service to register another backend for
+ * @param callable $closure the closure to be called on service creation
+ */
+ function registerService($name, \Closure $closure, $shared = true)
+ {
+ if ($shared) {
+ $this[$name] = \Pimple::share($closure);
+ } else {
+ $this[$name] = $closure;
+ }
+ }
+}
diff --git a/lib/appframework/utility/timefactory.php b/lib/appframework/utility/timefactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c3dd6cf5e3182e7c73a01964241b55b1edeb134
--- /dev/null
+++ b/lib/appframework/utility/timefactory.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+/**
+ * Needed to mock calls to time()
+ */
+class TimeFactory {
+
+
+ /**
+ * @return int the result of a call to time()
+ */
+ public function getTime() {
+ return time();
+ }
+
+
+}
diff --git a/lib/archive.php b/lib/archive.php
index 364cd5a74a1c9a880cef6400da70c0cc124c1ce5..85bfae57295d64e6bb49731519e360ae744db1cf 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -119,7 +119,8 @@ abstract class OC_Archive{
* @return bool
*/
function addRecursive($path, $source) {
- if($dh=opendir($source)) {
+ $dh = opendir($source);
+ if(is_resource($dh)) {
$this->addFolder($path);
while (($file = readdir($dh)) !== false) {
if($file=='.' or $file=='..') {
diff --git a/lib/avatar.php b/lib/avatar.php
new file mode 100644
index 0000000000000000000000000000000000000000..f20980c364b0290c1b98f218d2997156732389d2
--- /dev/null
+++ b/lib/avatar.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This class gets and sets users avatars.
+ */
+
+class OC_Avatar {
+
+ private $view;
+
+ /**
+ * @brief constructor
+ * @param $user string user to do avatar-management with
+ */
+ public function __construct ($user) {
+ $this->view = new \OC\Files\View('/'.$user);
+ }
+
+ /**
+ * @brief get the users avatar
+ * @param $size integer size in px of the avatar, defaults to 64
+ * @return boolean|\OC_Image containing the avatar or false if there's no image
+ */
+ public function get ($size = 64) {
+ if ($this->view->file_exists('avatar.jpg')) {
+ $ext = 'jpg';
+ } elseif ($this->view->file_exists('avatar.png')) {
+ $ext = 'png';
+ } else {
+ return false;
+ }
+
+ $avatar = new OC_Image();
+ $avatar->loadFromData($this->view->file_get_contents('avatar.'.$ext));
+ $avatar->resize($size);
+ return $avatar;
+ }
+
+ /**
+ * @brief sets the users avatar
+ * @param $data mixed imagedata or path to set a new avatar
+ * @throws Exception if the provided file is not a jpg or png image
+ * @throws Exception if the provided image is not valid
+ * @throws \OC\NotSquareException if the image is not square
+ * @return void
+ */
+ public function set ($data) {
+ if (\OC_App::isEnabled('files_encryption')) {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Custom profile pictures don't work with encryption yet"));
+ }
+
+ $img = new OC_Image($data);
+ $type = substr($img->mimeType(), -3);
+ if ($type === 'peg') { $type = 'jpg'; }
+ if ($type !== 'jpg' && $type !== 'png') {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Unknown filetype"));
+ }
+
+ if (!$img->valid()) {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Invalid image"));
+ }
+
+ if (!($img->height() === $img->width())) {
+ throw new \OC\NotSquareException();
+ }
+
+ $this->view->unlink('avatar.jpg');
+ $this->view->unlink('avatar.png');
+ $this->view->file_put_contents('avatar.'.$type, $data);
+ }
+
+ /**
+ * @brief remove the users avatar
+ * @return void
+ */
+ public function remove () {
+ $this->view->unlink('avatar.jpg');
+ $this->view->unlink('avatar.png');
+ }
+}
diff --git a/lib/base.php b/lib/base.php
index b5c12a683ffde21e39359ac313015630b8a7a09d..1720a5fd7e1a04490f52a7203ae94ecc708bdd95 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -84,6 +84,11 @@ class OC {
*/
public static $loader = null;
+ /**
+ * @var \OC\Server
+ */
+ public static $server = null;
+
public static function initPaths() {
// calculate the root directories
OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
@@ -266,6 +271,14 @@ class OC {
OC_Util::addScript('router');
OC_Util::addScript("oc-requesttoken");
+ // avatars
+ if (\OC_Config::getValue('enable_avatars', true) === true) {
+ \OC_Util::addScript('placeholder');
+ \OC_Util::addScript('3rdparty', 'md5/md5.min');
+ \OC_Util::addScript('jquery.avatar');
+ \OC_Util::addScript('avatar');
+ }
+
OC_Util::addStyle("styles");
OC_Util::addStyle("apps");
OC_Util::addStyle("fixes");
@@ -417,7 +430,7 @@ class OC {
}
self::initPaths();
- OC_Util::issetlocaleworking();
+ OC_Util::isSetLocaleWorking();
// set debug mode if an xdebug session is active
if (!defined('DEBUG') || !DEBUG) {
@@ -442,6 +455,9 @@ class OC {
stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
+ // setup the basic server
+ self::$server = new \OC\Server();
+
self::initTemplateEngine();
if (!self::$CLI) {
self::initSession();
@@ -529,7 +545,7 @@ class OC {
}
// write error into log if locale can't be set
- if (OC_Util::issetlocaleworking() == false) {
+ if (OC_Util::isSetLocaleWorking() == false) {
OC_Log::write('core',
'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system',
OC_Log::ERROR);
@@ -768,7 +784,7 @@ class OC {
if (in_array($_COOKIE['oc_token'], $tokens, true)) {
// replace successfully used token with a new one
OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
- $token = OC_Util::generate_random_bytes(32);
+ $token = OC_Util::generateRandomBytes(32);
OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
// login
@@ -808,7 +824,7 @@ class OC {
if (defined("DEBUG") && DEBUG) {
OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
}
- $token = OC_Util::generate_random_bytes(32);
+ $token = OC_Util::generateRandomBytes(32);
OC_Preferences::setValue($userid, 'login_token', $token, time());
OC_User::setMagicInCookie($userid, $token);
} else {
@@ -826,16 +842,11 @@ class OC {
) {
return false;
}
- // don't redo authentication if user is already logged in
- // otherwise session would be invalidated in OC_User::login with
- // session_regenerate_id at every page load
- if (!OC_User::isLoggedIn()) {
- OC_App::loadApps(array('authentication'));
- if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
- //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
- OC_User::unsetMagicInCookie();
- $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
- }
+ OC_App::loadApps(array('authentication'));
+ if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+ //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+ OC_User::unsetMagicInCookie();
+ $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
}
return true;
}
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 9fee6034a714d34a250727af701a9b4fdf331098..361138e47362138295c67873ca611aa26c12fd55 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -80,9 +80,11 @@ class OC_Cache_File{
$storage = $this->getStorage();
if($storage and $storage->is_dir('/')) {
$dh=$storage->opendir('/');
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
- $storage->unlink('/'.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
+ $storage->unlink('/'.$file);
+ }
}
}
}
@@ -94,6 +96,9 @@ class OC_Cache_File{
if($storage and $storage->is_dir('/')) {
$now = time();
$dh=$storage->opendir('/');
+ if(!is_resource($dh)) {
+ return null;
+ }
while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = $storage->filemtime('/'.$file);
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 2fbd8ca3edbd0b5ae30cecda282ceecbf65ee207..c0bd8e45f39a67729a37baf60ee7073599baa076 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -69,9 +69,11 @@ class OC_Cache_FileGlobal{
$prefix = $this->fixKey($prefix);
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
- unlink($cache_dir.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
+ unlink($cache_dir.$file);
+ }
}
}
}
@@ -88,11 +90,13 @@ class OC_Cache_FileGlobal{
$cache_dir = self::getCacheDir();
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..') {
- $mtime = filemtime($cache_dir.$file);
- if ($mtime < $now) {
- unlink($cache_dir.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..') {
+ $mtime = filemtime($cache_dir.$file);
+ if ($mtime < $now) {
+ unlink($cache_dir.$file);
+ }
}
}
}
diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php
index b298813a202c6a5e62b5419f12ba22fb5048af9b..acff45ed5e2c0daa814843f78a5669445bb012c9 100644
--- a/lib/connector/sabre/objecttree.php
+++ b/lib/connector/sabre/objecttree.php
@@ -88,11 +88,13 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
} else {
Filesystem::mkdir($destination);
$dh = Filesystem::opendir($source);
- while (($subnode = readdir($dh)) !== false) {
+ if(is_resource($dh)) {
+ while (($subnode = readdir($dh)) !== false) {
- if ($subnode == '.' || $subnode == '..') continue;
- $this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
+ if ($subnode == '.' || $subnode == '..') continue;
+ $this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
+ }
}
}
diff --git a/lib/contactsmanager.php b/lib/contactsmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc6745b450506b063afe027cb8f3578d2e53093d
--- /dev/null
+++ b/lib/contactsmanager.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC {
+
+ class ContactsManager implements \OCP\Contacts\IManager {
+
+ /**
+ * This function is used to search and find contacts within the users address books.
+ * In case $pattern is empty all contacts will be returned.
+ *
+ * @param string $pattern which should match within the $searchProperties
+ * @param array $searchProperties defines the properties within the query pattern should match
+ * @param array $options - for future use. One should always have options!
+ * @return array of contacts which are arrays of key-value-pairs
+ */
+ public function search($pattern, $searchProperties = array(), $options = array()) {
+ $result = array();
+ foreach($this->address_books as $address_book) {
+ $r = $address_book->search($pattern, $searchProperties, $options);
+ $result = array_merge($result, $r);
+ }
+
+ return $result;
+ }
+
+ /**
+ * This function can be used to delete the contact identified by the given id
+ *
+ * @param object $id the unique identifier to a contact
+ * @param $address_book_key
+ * @return bool successful or not
+ */
+ public function delete($id, $address_book_key) {
+ if (!array_key_exists($address_book_key, $this->address_books))
+ return null;
+
+ $address_book = $this->address_books[$address_book_key];
+ if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
+ return null;
+
+ return $address_book->delete($id);
+ }
+
+ /**
+ * This function is used to create a new contact if 'id' is not given or not present.
+ * Otherwise the contact will be updated by replacing the entire data set.
+ *
+ * @param array $properties this array if key-value-pairs defines a contact
+ * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+ * @return array representing the contact just created or updated
+ */
+ public function createOrUpdate($properties, $address_book_key) {
+
+ if (!array_key_exists($address_book_key, $this->address_books))
+ return null;
+
+ $address_book = $this->address_books[$address_book_key];
+ if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
+ return null;
+
+ return $address_book->createOrUpdate($properties);
+ }
+
+ /**
+ * Check if contacts are available (e.g. contacts app enabled)
+ *
+ * @return bool true if enabled, false if not
+ */
+ public function isEnabled() {
+ return !empty($this->address_books);
+ }
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ public function registerAddressBook(\OCP\IAddressBook $address_book) {
+ $this->address_books[$address_book->getKey()] = $address_book;
+ }
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ public function unregisterAddressBook(\OCP\IAddressBook $address_book) {
+ unset($this->address_books[$address_book->getKey()]);
+ }
+
+ /**
+ * @return array
+ */
+ public function getAddressBooks() {
+ $result = array();
+ foreach($this->address_books as $address_book) {
+ $result[$address_book->getKey()] = $address_book->getDisplayName();
+ }
+
+ return $result;
+ }
+
+ /**
+ * removes all registered address book instances
+ */
+ public function clear() {
+ $this->address_books = array();
+ }
+
+ /**
+ * @var \OCP\IAddressBook[] which holds all registered address books
+ */
+ private $address_books = array();
+
+ /**
+ * In order to improve lazy loading a closure can be registered which will be called in case
+ * address books are actually requested
+ *
+ * @param string $key
+ * @param \Closure $callable
+ */
+ function register($key, \Closure $callable)
+ {
+ //
+ //TODO: implement me
+ //
+ }
+ }
+}
diff --git a/lib/db.php b/lib/db.php
index ebd012c72f812f29cfed7e6da469471bb762aedb..b9505b88d8274769ec5d58d008a6d50a7d83e142 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -75,6 +75,7 @@ class OC_DB {
// do nothing if the connection already has been established
if (!self::$connection) {
$config = new \Doctrine\DBAL\Configuration();
+ $eventManager = new \Doctrine\Common\EventManager();
switch($type) {
case 'sqlite':
case 'sqlite3':
@@ -123,6 +124,7 @@ class OC_DB {
$connectionParams['port'] = $port;
}
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
+ $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
break;
case 'mssql':
$connectionParams = array(
@@ -142,7 +144,7 @@ class OC_DB {
$connectionParams['wrapperClass'] = 'OC\DB\Connection';
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
try {
- self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+ self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
if ($type === 'sqlite' || $type === 'sqlite3') {
// Sqlite doesn't handle query caching and schema changes
// TODO: find a better way to handle this
@@ -329,18 +331,6 @@ class OC_DB {
self::$connection->commit();
}
- /**
- * @brief Disconnect
- *
- * This is good bye, good bye, yeah!
- */
- public static function disconnect() {
- // Cut connection if required
- if(self::$connection) {
- self::$connection->close();
- }
- }
-
/**
* @brief saves database schema to xml file
* @param string $file name of file
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 87fa7c1365a2ecd3fa2a805d28a83d5f1ead3006..9d180820e9d28f7fd1f501110f145b7a39694663 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -159,20 +159,22 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
- while (($file = readdir($dh)) !== false) {
- $child = ($path) ? $path . '/' . $file : $file;
- if (!Filesystem::isIgnoredDir($file)) {
- $newChildren[] = $file;
- $data = $this->scanFile($child, $reuse, true);
- if ($data) {
- if ($data['size'] === -1) {
- if ($recursive === self::SCAN_RECURSIVE) {
- $childQueue[] = $child;
- } else {
- $size = -1;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ $child = ($path) ? $path . '/' . $file : $file;
+ if (!Filesystem::isIgnoredDir($file)) {
+ $newChildren[] = $file;
+ $data = $this->scanFile($child, $reuse, true);
+ if ($data) {
+ if ($data['size'] === -1) {
+ if ($recursive === self::SCAN_RECURSIVE) {
+ $childQueue[] = $child;
+ } else {
+ $size = -1;
+ }
+ } else if ($size !== -1) {
+ $size += $data['size'];
}
- } else if ($size !== -1) {
- $size += $data['size'];
}
}
}
diff --git a/lib/files/node/file.php b/lib/files/node/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..75d5e0166b638139d962f1056af8b6a9f7802772
--- /dev/null
+++ b/lib/files/node/file.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotPermittedException;
+
+class File extends Node implements \OCP\Files\File {
+ /**
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getContent() {
+ if ($this->checkPermissions(\OCP\PERMISSION_READ)) {
+ /**
+ * @var \OC\Files\Storage\Storage $storage;
+ */
+ return $this->view->file_get_contents($this->path);
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $data
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function putContent($data) {
+ if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+ $this->sendHooks(array('preWrite'));
+ $this->view->file_put_contents($this->path, $data);
+ $this->sendHooks(array('postWrite'));
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function getMimeType() {
+ return $this->view->getMimeType($this->path);
+ }
+
+ /**
+ * @param string $mode
+ * @return resource
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function fopen($mode) {
+ $preHooks = array();
+ $postHooks = array();
+ $requiredPermissions = \OCP\PERMISSION_READ;
+ switch ($mode) {
+ case 'r+':
+ case 'rb+':
+ case 'w+':
+ case 'wb+':
+ case 'x+':
+ case 'xb+':
+ case 'a+':
+ case 'ab+':
+ case 'w':
+ case 'wb':
+ case 'x':
+ case 'xb':
+ case 'a':
+ case 'ab':
+ $preHooks[] = 'preWrite';
+ $postHooks[] = 'postWrite';
+ $requiredPermissions |= \OCP\PERMISSION_UPDATE;
+ break;
+ }
+
+ if ($this->checkPermissions($requiredPermissions)) {
+ $this->sendHooks($preHooks);
+ $result = $this->view->fopen($this->path, $mode);
+ $this->sendHooks($postHooks);
+ return $result;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ public function delete() {
+ if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+ $this->sendHooks(array('preDelete'));
+ $this->view->unlink($this->path);
+ $nonExisting = new NonExistingFile($this->root, $this->view, $this->path);
+ $this->root->emit('\OC\Files', 'postDelete', array($nonExisting));
+ $this->exists = false;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->copy($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->rename($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ $this->path = $targetPath;
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $type
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $raw = false) {
+ return $this->view->hash($type, $this->path, $raw);
+ }
+}
diff --git a/lib/files/node/folder.php b/lib/files/node/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..923f53821b2b2fea687e56d0c358237072cbce65
--- /dev/null
+++ b/lib/files/node/folder.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+
+class Folder extends Node implements \OCP\Files\Folder {
+ /**
+ * @param string $path path relative to the folder
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getFullPath($path) {
+ if (!$this->isValidPath($path)) {
+ throw new NotPermittedException();
+ }
+ return $this->path . $this->normalizePath($path);
+ }
+
+ /**
+ * @param string $path
+ * @throws \OCP\Files\NotFoundException
+ * @return string
+ */
+ public function getRelativePath($path) {
+ if ($this->path === '' or $this->path === '/') {
+ return $this->normalizePath($path);
+ }
+ if (strpos($path, $this->path) !== 0) {
+ throw new NotFoundException();
+ } else {
+ $path = substr($path, strlen($this->path));
+ if (strlen($path) === 0) {
+ return '/';
+ } else {
+ return $this->normalizePath($path);
+ }
+ }
+ }
+
+ /**
+ * check if a node is a (grand-)child of the folder
+ *
+ * @param \OC\Files\Node\Node $node
+ * @return bool
+ */
+ public function isSubNode($node) {
+ return strpos($node->getPath(), $this->path . '/') === 0;
+ }
+
+ /**
+ * get the content of this directory
+ *
+ * @throws \OCP\Files\NotFoundException
+ * @return Node[]
+ */
+ public function getDirectoryListing() {
+ $result = array();
+
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ list($storage, $internalPath) = $this->view->resolvePath($this->path);
+ if ($storage) {
+ $cache = $storage->getCache($internalPath);
+ $permissionsCache = $storage->getPermissionsCache($internalPath);
+
+ //trigger cache update check
+ $this->view->getFileInfo($this->path);
+
+ $files = $cache->getFolderContents($internalPath);
+ $permissions = $permissionsCache->getDirectoryPermissions($this->getId(), $this->root->getUser()->getUID());
+ } else {
+ $files = array();
+ }
+
+ //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
+ $mounts = $this->root->getMountsIn($this->path);
+ $dirLength = strlen($this->path);
+ foreach ($mounts as $mount) {
+ $subStorage = $mount->getStorage();
+ if ($subStorage) {
+ $subCache = $subStorage->getCache('');
+
+ if ($subCache->getStatus('') === Cache::NOT_FOUND) {
+ $subScanner = $subStorage->getScanner('');
+ $subScanner->scanFile('');
+ }
+
+ $rootEntry = $subCache->get('');
+ if ($rootEntry) {
+ $relativePath = trim(substr($mount->getMountPoint(), $dirLength), '/');
+ if ($pos = strpos($relativePath, '/')) {
+ //mountpoint inside subfolder add size to the correct folder
+ $entryName = substr($relativePath, 0, $pos);
+ foreach ($files as &$entry) {
+ if ($entry['name'] === $entryName) {
+ if ($rootEntry['size'] >= 0) {
+ $entry['size'] += $rootEntry['size'];
+ } else {
+ $entry['size'] = -1;
+ }
+ }
+ }
+ } else { //mountpoint in this folder, add an entry for it
+ $rootEntry['name'] = $relativePath;
+ $rootEntry['storageObject'] = $subStorage;
+
+ //remove any existing entry with the same name
+ foreach ($files as $i => $file) {
+ if ($file['name'] === $rootEntry['name']) {
+ $files[$i] = null;
+ break;
+ }
+ }
+ $files[] = $rootEntry;
+ }
+ }
+ }
+ }
+
+ foreach ($files as $file) {
+ if ($file) {
+ if (isset($permissions[$file['fileid']])) {
+ $file['permissions'] = $permissions[$file['fileid']];
+ }
+ $node = $this->createNode($this->path . '/' . $file['name'], $file);
+ $result[] = $node;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param string $path
+ * @param array $info
+ * @return File|Folder
+ */
+ protected function createNode($path, $info = array()) {
+ if (!isset($info['mimetype'])) {
+ $isDir = $this->view->is_dir($path);
+ } else {
+ $isDir = $info['mimetype'] === 'httpd/unix-directory';
+ }
+ if ($isDir) {
+ return new Folder($this->root, $this->view, $path);
+ } else {
+ return new File($this->root, $this->view, $path);
+ }
+ }
+
+ /**
+ * Get the node at $path
+ *
+ * @param string $path
+ * @return \OC\Files\Node\Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function get($path) {
+ return $this->root->get($this->getFullPath($path));
+ }
+
+ /**
+ * @param string $path
+ * @return bool
+ */
+ public function nodeExists($path) {
+ try {
+ $this->get($path);
+ return true;
+ } catch (NotFoundException $e) {
+ return false;
+ }
+ }
+
+ /**
+ * @param string $path
+ * @return \OC\Files\Node\Folder
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFolder($path) {
+ if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+ $fullPath = $this->getFullPath($path);
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
+ $this->view->mkdir($fullPath);
+ $node = new Folder($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'postWrite', array($node));
+ $this->root->emit('\OC\Files', 'postCreate', array($node));
+ return $node;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $path
+ * @return \OC\Files\Node\File
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFile($path) {
+ if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+ $fullPath = $this->getFullPath($path);
+ $nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
+ $this->view->touch($fullPath);
+ $node = new File($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'postWrite', array($node));
+ $this->root->emit('\OC\Files', 'postCreate', array($node));
+ return $node;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * search for files with the name matching $query
+ *
+ * @param string $query
+ * @return \OC\Files\Node\Node[]
+ */
+ public function search($query) {
+ return $this->searchCommon('%' . $query . '%', 'search');
+ }
+
+ /**
+ * search for files by mimetype
+ *
+ * @param string $mimetype
+ * @return Node[]
+ */
+ public function searchByMime($mimetype) {
+ return $this->searchCommon($mimetype, 'searchByMime');
+ }
+
+ /**
+ * @param string $query
+ * @param string $method
+ * @return \OC\Files\Node\Node[]
+ */
+ private function searchCommon($query, $method) {
+ $files = array();
+ $rootLength = strlen($this->path);
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ list($storage, $internalPath) = $this->view->resolvePath($this->path);
+ $internalRootLength = strlen($internalPath);
+
+ $cache = $storage->getCache('');
+
+ $results = $cache->$method($query);
+ foreach ($results as $result) {
+ if ($internalRootLength === 0 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
+ $result['internalPath'] = $result['path'];
+ $result['path'] = substr($result['path'], $internalRootLength);
+ $result['storage'] = $storage;
+ $files[] = $result;
+ }
+ }
+
+ $mounts = $this->root->getMountsIn($this->path);
+ foreach ($mounts as $mount) {
+ $storage = $mount->getStorage();
+ if ($storage) {
+ $cache = $storage->getCache('');
+
+ $relativeMountPoint = substr($mount->getMountPoint(), $rootLength);
+ $results = $cache->$method($query);
+ foreach ($results as $result) {
+ $result['internalPath'] = $result['path'];
+ $result['path'] = $relativeMountPoint . $result['path'];
+ $result['storage'] = $storage;
+ $files[] = $result;
+ }
+ }
+ }
+
+ $result = array();
+ foreach ($files as $file) {
+ $result[] = $this->createNode($this->normalizePath($this->path . '/' . $file['path']), $file);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param $id
+ * @return \OC\Files\Node\Node[]
+ */
+ public function getById($id) {
+ $nodes = $this->root->getById($id);
+ $result = array();
+ foreach ($nodes as $node) {
+ $pathPart = substr($node->getPath(), 0, strlen($this->getPath()) + 1);
+ if ($this->path === '/' or $pathPart === $this->getPath() . '/') {
+ $result[] = $node;
+ }
+ }
+ return $result;
+ }
+
+ public function getFreeSpace() {
+ return $this->view->free_space($this->path);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isCreatable() {
+ return $this->checkPermissions(\OCP\PERMISSION_CREATE);
+ }
+
+ public function delete() {
+ if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+ $this->sendHooks(array('preDelete'));
+ $this->view->rmdir($this->path);
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $this->path);
+ $this->root->emit('\OC\Files', 'postDelete', array($nonExisting));
+ $this->exists = false;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->copy($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->rename($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ $this->path = $targetPath;
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+}
diff --git a/lib/files/node/node.php b/lib/files/node/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..063e2424a64d351e358ef30b789e0bfe73ed79df
--- /dev/null
+++ b/lib/files/node/node.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+
+class Node implements \OCP\Files\Node {
+ /**
+ * @var \OC\Files\View $view
+ */
+ protected $view;
+
+ /**
+ * @var \OC\Files\Node\Root $root
+ */
+ protected $root;
+
+ /**
+ * @var string $path
+ */
+ protected $path;
+
+ /**
+ * @param \OC\Files\View $view
+ * @param \OC\Files\Node\Root Root $root
+ * @param string $path
+ */
+ public function __construct($root, $view, $path) {
+ $this->view = $view;
+ $this->root = $root;
+ $this->path = $path;
+ }
+
+ /**
+ * @param string[] $hooks
+ */
+ protected function sendHooks($hooks) {
+ foreach ($hooks as $hook) {
+ $this->root->emit('\OC\Files', $hook, array($this));
+ }
+ }
+
+ /**
+ * @param int $permissions
+ * @return bool
+ */
+ protected function checkPermissions($permissions) {
+ return ($this->getPermissions() & $permissions) === $permissions;
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ return;
+ }
+
+ public function delete() {
+ return;
+ }
+
+ /**
+ * @param string $targetPath
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ return;
+ }
+
+ /**
+ * @param int $mtime
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null) {
+ if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+ $this->sendHooks(array('preTouch'));
+ $this->view->touch($this->path, $mtime);
+ $this->sendHooks(array('postTouch'));
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @return \OC\Files\Storage\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage() {
+ list($storage,) = $this->view->resolvePath($this->path);
+ return $storage;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath() {
+ return $this->path;
+ }
+
+ /**
+ * @return string
+ */
+ public function getInternalPath() {
+ list(, $internalPath) = $this->view->resolvePath($this->path);
+ return $internalPath;
+ }
+
+ /**
+ * @return int
+ */
+ public function getId() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['fileid'];
+ }
+
+ /**
+ * @return array
+ */
+ public function stat() {
+ return $this->view->stat($this->path);
+ }
+
+ /**
+ * @return int
+ */
+ public function getMTime() {
+ return $this->view->filemtime($this->path);
+ }
+
+ /**
+ * @return int
+ */
+ public function getSize() {
+ return $this->view->filesize($this->path);
+ }
+
+ /**
+ * @return string
+ */
+ public function getEtag() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['etag'];
+ }
+
+ /**
+ * @return int
+ */
+ public function getPermissions() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['permissions'];
+ }
+
+ /**
+ * @return bool
+ */
+ public function isReadable() {
+ return $this->checkPermissions(\OCP\PERMISSION_READ);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isUpdateable() {
+ return $this->checkPermissions(\OCP\PERMISSION_UPDATE);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDeletable() {
+ return $this->checkPermissions(\OCP\PERMISSION_DELETE);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isShareable() {
+ return $this->checkPermissions(\OCP\PERMISSION_SHARE);
+ }
+
+ /**
+ * @return Node
+ */
+ public function getParent() {
+ return $this->root->get(dirname($this->path));
+ }
+
+ /**
+ * @return string
+ */
+ public function getName() {
+ return basename($this->path);
+ }
+
+ /**
+ * @param string $path
+ * @return string
+ */
+ protected function normalizePath($path) {
+ if ($path === '' or $path === '/') {
+ return '/';
+ }
+ //no windows style slashes
+ $path = str_replace('\\', '/', $path);
+ //add leading slash
+ if ($path[0] !== '/') {
+ $path = '/' . $path;
+ }
+ //remove duplicate slashes
+ while (strpos($path, '//') !== false) {
+ $path = str_replace('//', '/', $path);
+ }
+ //remove trailing slash
+ $path = rtrim($path, '/');
+
+ return $path;
+ }
+
+ /**
+ * check if the requested path is valid
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isValidPath($path) {
+ if (!$path || $path[0] !== '/') {
+ $path = '/' . $path;
+ }
+ if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/lib/files/node/nonexistingfile.php b/lib/files/node/nonexistingfile.php
new file mode 100644
index 0000000000000000000000000000000000000000..d45076f7feee3940057304d245fc278228f196c7
--- /dev/null
+++ b/lib/files/node/nonexistingfile.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotFoundException;
+
+class NonExistingFile extends File {
+ /**
+ * @param string $newPath
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function rename($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function delete() {
+ throw new NotFoundException();
+ }
+
+ public function copy($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function touch($mtime = null) {
+ throw new NotFoundException();
+ }
+
+ public function getId() {
+ throw new NotFoundException();
+ }
+
+ public function stat() {
+ throw new NotFoundException();
+ }
+
+ public function getMTime() {
+ throw new NotFoundException();
+ }
+
+ public function getSize() {
+ throw new NotFoundException();
+ }
+
+ public function getEtag() {
+ throw new NotFoundException();
+ }
+
+ public function getPermissions() {
+ throw new NotFoundException();
+ }
+
+ public function isReadable() {
+ throw new NotFoundException();
+ }
+
+ public function isUpdateable() {
+ throw new NotFoundException();
+ }
+
+ public function isDeletable() {
+ throw new NotFoundException();
+ }
+
+ public function isShareable() {
+ throw new NotFoundException();
+ }
+
+ public function getContent() {
+ throw new NotFoundException();
+ }
+
+ public function putContent($data) {
+ throw new NotFoundException();
+ }
+
+ public function getMimeType() {
+ throw new NotFoundException();
+ }
+
+ public function fopen($mode) {
+ throw new NotFoundException();
+ }
+}
diff --git a/lib/files/node/nonexistingfolder.php b/lib/files/node/nonexistingfolder.php
new file mode 100644
index 0000000000000000000000000000000000000000..0346cbf1e2127456e345a49c8b09343e168a3e43
--- /dev/null
+++ b/lib/files/node/nonexistingfolder.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotFoundException;
+
+class NonExistingFolder extends Folder {
+ /**
+ * @param string $newPath
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function rename($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function delete() {
+ throw new NotFoundException();
+ }
+
+ public function copy($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function touch($mtime = null) {
+ throw new NotFoundException();
+ }
+
+ public function getId() {
+ throw new NotFoundException();
+ }
+
+ public function stat() {
+ throw new NotFoundException();
+ }
+
+ public function getMTime() {
+ throw new NotFoundException();
+ }
+
+ public function getSize() {
+ throw new NotFoundException();
+ }
+
+ public function getEtag() {
+ throw new NotFoundException();
+ }
+
+ public function getPermissions() {
+ throw new NotFoundException();
+ }
+
+ public function isReadable() {
+ throw new NotFoundException();
+ }
+
+ public function isUpdateable() {
+ throw new NotFoundException();
+ }
+
+ public function isDeletable() {
+ throw new NotFoundException();
+ }
+
+ public function isShareable() {
+ throw new NotFoundException();
+ }
+
+ public function get($path) {
+ throw new NotFoundException();
+ }
+
+ public function getDirectoryListing() {
+ throw new NotFoundException();
+ }
+
+ public function nodeExists($path) {
+ return false;
+ }
+
+ public function newFolder($path) {
+ throw new NotFoundException();
+ }
+
+ public function newFile($path) {
+ throw new NotFoundException();
+ }
+
+ public function search($pattern) {
+ throw new NotFoundException();
+ }
+
+ public function searchByMime($mime) {
+ throw new NotFoundException();
+ }
+
+ public function getById($id) {
+ throw new NotFoundException();
+ }
+
+ public function getFreeSpace() {
+ throw new NotFoundException();
+ }
+
+ public function isCreatable() {
+ throw new NotFoundException();
+ }
+}
diff --git a/lib/files/node/root.php b/lib/files/node/root.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3d58476e9ce68b4784b395a22345c17ac4d68a5
--- /dev/null
+++ b/lib/files/node/root.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OC\Files\Mount\Manager;
+use OC\Files\Mount\Mount;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Hooks\Emitter;
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Root
+ *
+ * Hooks available in scope \OC\Files
+ * - preWrite(\OCP\Files\Node $node)
+ * - postWrite(\OCP\Files\Node $node)
+ * - preCreate(\OCP\Files\Node $node)
+ * - postCreate(\OCP\Files\Node $node)
+ * - preDelete(\OCP\Files\Node $node)
+ * - postDelete(\OCP\Files\Node $node)
+ * - preTouch(\OC\FilesP\Node $node, int $mtime)
+ * - postTouch(\OCP\Files\Node $node)
+ * - preCopy(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - postCopy(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - preRename(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - postRename(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ *
+ * @package OC\Files\Node
+ */
+class Root extends Folder implements Emitter {
+
+ /**
+ * @var \OC\Files\Mount\Manager $mountManager
+ */
+ private $mountManager;
+
+ /**
+ * @var \OC\Hooks\PublicEmitter
+ */
+ private $emitter;
+
+ /**
+ * @var \OC\User\User $user
+ */
+ private $user;
+
+ /**
+ * @param \OC\Files\Mount\Manager $manager
+ * @param \OC\Files\View $view
+ * @param \OC\User\User $user
+ */
+ public function __construct($manager, $view, $user) {
+ parent::__construct($this, $view, '');
+ $this->mountManager = $manager;
+ $this->user = $user;
+ $this->emitter = new PublicEmitter();
+ }
+
+ /**
+ * Get the user for which the filesystem is setup
+ *
+ * @return \OC\User\User
+ */
+ public function getUser() {
+ return $this->user;
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback) {
+ $this->emitter->listen($scope, $method, $callback);
+ }
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function removeListener($scope = null, $method = null, $callback = null) {
+ $this->emitter->removeListener($scope, $method, $callback);
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param array $arguments
+ */
+ public function emit($scope, $method, $arguments = array()) {
+ $this->emitter->emit($scope, $method, $arguments);
+ }
+
+ /**
+ * @param \OC\Files\Storage\Storage $storage
+ * @param string $mountPoint
+ * @param array $arguments
+ */
+ public function mount($storage, $mountPoint, $arguments = array()) {
+ $mount = new Mount($storage, $mountPoint, $arguments);
+ $this->mountManager->addMount($mount);
+ }
+
+ /**
+ * @param string $mountPoint
+ * @return \OC\Files\Mount\Mount
+ */
+ public function getMount($mountPoint) {
+ return $this->mountManager->find($mountPoint);
+ }
+
+ /**
+ * @param string $mountPoint
+ * @return \OC\Files\Mount\Mount[]
+ */
+ public function getMountsIn($mountPoint) {
+ return $this->mountManager->findIn($mountPoint);
+ }
+
+ /**
+ * @param string $storageId
+ * @return \OC\Files\Mount\Mount[]
+ */
+ public function getMountByStorageId($storageId) {
+ return $this->mountManager->findByStorageId($storageId);
+ }
+
+ /**
+ * @param int $numericId
+ * @return Mount[]
+ */
+ public function getMountByNumericStorageId($numericId) {
+ return $this->mountManager->findByNumericId($numericId);
+ }
+
+ /**
+ * @param \OC\Files\Mount\Mount $mount
+ */
+ public function unMount($mount) {
+ $this->mountManager->remove($mount);
+ }
+
+ /**
+ * @param string $path
+ * @throws \OCP\Files\NotFoundException
+ * @throws \OCP\Files\NotPermittedException
+ * @return Node
+ */
+ public function get($path) {
+ $path = $this->normalizePath($path);
+ if ($this->isValidPath($path)) {
+ $fullPath = $this->getFullPath($path);
+ if ($this->view->file_exists($fullPath)) {
+ return $this->createNode($fullPath);
+ } else {
+ throw new NotFoundException();
+ }
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * search file by id
+ *
+ * An array is returned because in the case where a single storage is mounted in different places the same file
+ * can exist in different places
+ *
+ * @param int $id
+ * @throws \OCP\Files\NotFoundException
+ * @return Node[]
+ */
+ public function getById($id) {
+ $result = Cache::getById($id);
+ if (is_null($result)) {
+ throw new NotFoundException();
+ } else {
+ list($storageId, $internalPath) = $result;
+ $nodes = array();
+ $mounts = $this->mountManager->findByStorageId($storageId);
+ foreach ($mounts as $mount) {
+ $nodes[] = $this->get($mount->getMountPoint() . $internalPath);
+ }
+ return $nodes;
+ }
+
+ }
+
+ //most operations cant be done on the root
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function rename($targetPath) {
+ throw new NotPermittedException();
+ }
+
+ public function delete() {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @param int $mtime
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null) {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @return \OC\Files\Storage\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage() {
+ throw new NotFoundException();
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath() {
+ return '/';
+ }
+
+ /**
+ * @return string
+ */
+ public function getInternalPath() {
+ return '';
+ }
+
+ /**
+ * @return int
+ */
+ public function getId() {
+ return null;
+ }
+
+ /**
+ * @return array
+ */
+ public function stat() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMTime() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getSize() {
+ return null;
+ }
+
+ /**
+ * @return string
+ */
+ public function getEtag() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getPermissions() {
+ return \OCP\PERMISSION_CREATE;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isReadable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isUpdateable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDeletable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isShareable() {
+ return false;
+ }
+
+ /**
+ * @return Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getParent() {
+ throw new NotFoundException();
+ }
+
+ /**
+ * @return string
+ */
+ public function getName() {
+ return '';
+ }
+}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 01560f34fdef0d30149399c86e9e08c061db0984..a5b79f0e96763df55e01cf3f70aa45ec56f39f4f 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -142,13 +142,15 @@ abstract class Common implements \OC\Files\Storage\Storage {
return false;
} else {
$directoryHandle = $this->opendir($directory);
- while (($contents = readdir($directoryHandle)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
- $path = $directory . '/' . $contents;
- if ($this->is_dir($path)) {
- $this->deleteAll($path);
- } else {
- $this->unlink($path);
+ if(is_resource($directoryHandle)) {
+ while (($contents = readdir($directoryHandle)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
+ $path = $directory . '/' . $contents;
+ if ($this->is_dir($path)) {
+ $this->deleteAll($path);
+ } else {
+ $this->unlink($path);
+ }
}
}
}
@@ -224,7 +226,8 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
private function addLocalFolder($path, $target) {
- if ($dh = $this->opendir($path)) {
+ $dh = $this->opendir($path);
+ if(is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if ($file !== '.' and $file !== '..') {
if ($this->is_dir($path . '/' . $file)) {
@@ -242,7 +245,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
protected function searchInDir($query, $dir = '') {
$files = array();
$dh = $this->opendir($dir);
- if ($dh) {
+ if (is_resource($dh)) {
while (($item = readdir($dh)) !== false) {
if ($item == '.' || $item == '..') continue;
if (strstr(strtolower($item), strtolower($query)) !== false) {
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index fbf1b4ebf966b98af1bc67e79a926c5fb93e74a3..ba5ac4191c5b9b1fc595fb472c2c17125bd0a2d4 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -65,16 +65,18 @@ class MappedLocal extends \OC\Files\Storage\Common{
$logicalPath = $this->mapper->physicalToLogic($physicalPath);
$dh = opendir($physicalPath);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' or $file === '..') {
- continue;
- }
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' or $file === '..') {
+ continue;
+ }
- $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
+ $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
- $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
- $file = $this->stripLeading($file);
- $files[]= $file;
+ $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
+ $file = $this->stripLeading($file);
+ $files[]= $file;
+ }
}
\OC\Files\Stream\Dir::register('local-win32'.$path, $files);
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index c96caebf4af6307d22fc3ebb375f46e0792ae770..b673bb9a32d0dd5ff624cb87a7a83807cf7d700a 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -13,7 +13,7 @@ namespace OC\Files\Storage;
*
* All paths passed to the storage are relative to the storage and should NOT have a leading slash.
*/
-interface Storage {
+interface Storage extends \OCP\Files\Storage {
/**
* $parameters is a free form array with the configuration options needed to construct the storage
*
diff --git a/lib/files/utils/scanner.php b/lib/files/utils/scanner.php
index f0dc41ffad3fe040190338e83383e4d97f5707fa..2cad7dd77bd53caa21b567d907302f6960771fe2 100644
--- a/lib/files/utils/scanner.php
+++ b/lib/files/utils/scanner.php
@@ -72,6 +72,9 @@ class Scanner extends PublicEmitter {
public function backgroundScan($dir) {
$mounts = $this->getMounts($dir);
foreach ($mounts as $mount) {
+ if (is_null($mount->getStorage())) {
+ continue;
+ }
$scanner = $mount->getStorage()->getScanner();
$this->attachListener($mount);
$scanner->backgroundScan();
@@ -81,6 +84,9 @@ class Scanner extends PublicEmitter {
public function scan($dir) {
$mounts = $this->getMounts($dir);
foreach ($mounts as $mount) {
+ if (is_null($mount->getStorage())) {
+ continue;
+ }
$scanner = $mount->getStorage()->getScanner();
$this->attachListener($mount);
$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
diff --git a/lib/files/view.php b/lib/files/view.php
index 8aee12bf6fe2b157e490a40beb2697383032e6ae..968b755a66185226a2768568a19da6432dc4df80 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -30,7 +30,7 @@ class View {
private $internal_path_cache = array();
private $storage_cache = array();
- public function __construct($root) {
+ public function __construct($root = '') {
$this->fakeRoot = $root;
}
@@ -268,18 +268,18 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data)
and Filesystem::isValidPath($path)
- and !Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
$exists = $this->file_exists($path);
$run = true;
- if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
+ if ($this->shouldEmitHooks($path)) {
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_create,
array(
- Filesystem::signal_param_path => $path,
+ Filesystem::signal_param_path => $this->getHookPath($path),
Filesystem::signal_param_run => &$run
)
);
@@ -288,7 +288,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path,
+ Filesystem::signal_param_path => $this->getHookPath($path),
Filesystem::signal_param_run => &$run
)
);
@@ -301,18 +301,18 @@ class View {
list ($count, $result) = \OC_Helper::streamCopy($data, $target);
fclose($target);
fclose($data);
- if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) {
+ if ($this->shouldEmitHooks($path) && $result !== false) {
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
@@ -333,7 +333,7 @@ class View {
}
public function deleteAll($directory, $empty = false) {
- return $this->basicOperation('deleteAll', $directory, array('delete'), $empty);
+ return $this->rmdir($directory);
}
public function rename($path1, $path2) {
@@ -354,21 +354,21 @@ class View {
return false;
}
$run = true;
- if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
+ if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
// if it was a rename from a part file to a regular file it was a write and not a rename operation
\OC_Hook::emit(
Filesystem::CLASSNAME, Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
- } elseif ($this->fakeRoot == Filesystem::getRoot()) {
+ } elseif ($this->shouldEmitHooks()) {
\OC_Hook::emit(
Filesystem::CLASSNAME, Filesystem::signal_rename,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2,
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -408,22 +408,22 @@ class View {
}
}
}
- if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+ if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
// if it was a rename from a part file to a regular file it was a write and not a rename operation
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
)
);
- } elseif ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ } elseif ($this->shouldEmitHooks() && $result !== false) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_rename,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2)
)
);
}
@@ -455,13 +455,13 @@ class View {
}
$run = true;
$exists = $this->file_exists($path2);
- if ($this->fakeRoot == Filesystem::getRoot()) {
+ if ($this->shouldEmitHooks()) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_copy,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2,
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -470,7 +470,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_create,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -480,7 +480,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -500,9 +500,11 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
- while (($file = readdir($dh)) !== false) {
- if (!Filesystem::isIgnoredDir($file)) {
- $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if (!Filesystem::isIgnoredDir($file)) {
+ $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ }
}
}
} else {
@@ -511,26 +513,26 @@ class View {
list($count, $result) = \OC_Helper::streamCopy($source, $target);
}
}
- if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ if ($this->shouldEmitHooks() && $result !== false) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2)
)
);
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
- array(Filesystem::signal_param_path => $path2)
+ array(Filesystem::signal_param_path => $this->getHookPath($path2))
);
}
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
- array(Filesystem::signal_param_path => $path2)
+ array(Filesystem::signal_param_path => $this->getHookPath($path2))
);
}
return $result;
@@ -621,11 +623,11 @@ class View {
if ($path == null) {
return false;
}
- if (Filesystem::$loaded && $this->fakeRoot == Filesystem::getRoot()) {
+ if ($this->shouldEmitHooks($path)) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_read,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
@@ -659,7 +661,7 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam)
and Filesystem::isValidPath($path)
- and !Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
if ($path == null) {
@@ -675,7 +677,7 @@ class View {
$result = $storage->$operation($internalPath);
}
$result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
- if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ if ($this->shouldEmitHooks($path) && $result !== false) {
if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
$this->runHooks($hooks, $path, true);
}
@@ -686,10 +688,35 @@ class View {
return null;
}
+ /**
+ * get the path relative to the default root for hook usage
+ *
+ * @param string $path
+ * @return string
+ */
+ private function getHookPath($path) {
+ if (!Filesystem::getView()) {
+ return $path;
+ }
+ return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path));
+ }
+
+ private function shouldEmitHooks($path = '') {
+ if ($path && Cache\Scanner::isPartialFile($path)) {
+ return false;
+ }
+ if (!Filesystem::$loaded) {
+ return false;
+ }
+ $defaultRoot = Filesystem::getRoot();
+ return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot);
+ }
+
private function runHooks($hooks, $path, $post = false) {
+ $path = $this->getHookPath($path);
$prefix = ($post) ? 'post_' : '';
$run = true;
- if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
+ if ($this->shouldEmitHooks($path)) {
foreach ($hooks as $hook) {
if ($hook != 'read') {
\OC_Hook::emit(
diff --git a/lib/helper.php b/lib/helper.php
index 5fb8fed3459570aa43ce5688d72d90d86f671e3c..66e7acb407a7d69d7f7c17353f911c9af1e1b9d5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -232,6 +232,14 @@ class OC_Helper {
self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder.png';
return OC::$WEBROOT . '/core/img/filetypes/folder.png';
}
+ if ($mimetype === 'dir-shared') {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-shared.png';
+ return OC::$WEBROOT . '/core/img/filetypes/folder-shared.png';
+ }
+ if ($mimetype === 'dir-external') {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-external.png';
+ return OC::$WEBROOT . '/core/img/filetypes/folder-external.png';
+ }
// Icon exists?
if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $icon . '.png')) {
@@ -274,7 +282,6 @@ class OC_Helper {
*/
public static function humanFileSize($bytes) {
if ($bytes < 0) {
- $l = OC_L10N::get('lib');
return "?";
}
if ($bytes < 1024) {
@@ -288,10 +295,17 @@ class OC_Helper {
if ($bytes < 1024) {
return "$bytes MB";
}
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
+ return "$bytes GB";
+ }
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
+ return "$bytes TB";
+ }
- // Wow, heavy duty for owncloud
$bytes = round($bytes / 1024, 1);
- return "$bytes GB";
+ return "$bytes PB";
}
/**
@@ -341,17 +355,19 @@ class OC_Helper {
if (!is_dir($path))
return chmod($path, $filemode);
$dh = opendir($path);
- while (($file = readdir($dh)) !== false) {
- if ($file != '.' && $file != '..') {
- $fullpath = $path . '/' . $file;
- if (is_link($fullpath))
- return false;
- elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
- return false; elseif (!self::chmodr($fullpath, $filemode))
- return false;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' && $file != '..') {
+ $fullpath = $path . '/' . $file;
+ if (is_link($fullpath))
+ return false;
+ elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
+ return false; elseif (!self::chmodr($fullpath, $filemode))
+ return false;
+ }
}
+ closedir($dh);
}
- closedir($dh);
if (@chmod($path, $filemode))
return true;
else
@@ -649,9 +665,11 @@ class OC_Helper {
// if oc-noclean is empty delete it
$isTmpDirNoCleanEmpty = true;
$tmpDirNoClean = opendir($tmpDirNoCleanName);
- while (false !== ($file = readdir($tmpDirNoClean))) {
- if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
- $isTmpDirNoCleanEmpty = false;
+ if(is_resource($tmpDirNoClean)) {
+ while (false !== ($file = readdir($tmpDirNoClean))) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ $isTmpDirNoCleanEmpty = false;
+ }
}
}
if ($isTmpDirNoCleanEmpty) {
@@ -694,7 +712,7 @@ class OC_Helper {
$newpath = $path . '/' . $filename;
if ($view->file_exists($newpath)) {
if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
- //Replace the last "(number)" with "(number+1)"
+ //Replace the last "(number)" with "(number+1)"
$last_match = count($matches[0]) - 1;
$counter = $matches[1][$last_match][0] + 1;
$offset = $matches[0][$last_match][1];
@@ -705,7 +723,7 @@ class OC_Helper {
}
do {
if ($offset) {
- //Replace the last "(number)" with "(number+1)"
+ //Replace the last "(number)" with "(number+1)"
$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
} else {
$newname = $name . ' (' . $counter . ')';
diff --git a/lib/installer.php b/lib/installer.php
index b9684eaeea051967af9b09dfcdd84b41c38fe5b6..e082c7eeee9d0772ee40011f9ae1e5378ccbff5f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -107,10 +107,12 @@ class OC_Installer{
if(!is_file($extractDir.'/appinfo/info.xml')) {
//try to find it in a subdir
$dh=opendir($extractDir);
- while (($folder = readdir($dh)) !== false) {
- if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
- if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
- $extractDir.='/'.$folder;
+ if(is_resource($dh)) {
+ while (($folder = readdir($dh)) !== false) {
+ if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
+ if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
+ $extractDir.='/'.$folder;
+ }
}
}
}
@@ -426,6 +428,7 @@ class OC_Installer{
'OC_API::',
'OC_App::',
'OC_AppConfig::',
+ 'OC_Avatar',
'OC_BackgroundJob::',
'OC_Config::',
'OC_DB::',
diff --git a/lib/l10n/ach.php b/lib/l10n/ach.php
new file mode 100644
index 0000000000000000000000000000000000000000..406ff5f5a26bac1dc6a395e62978681336ec099b
--- /dev/null
+++ b/lib/l10n/ach.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 7a82f8f6a192a6e8420e75ad05435a87b67a782b..047d5d955bb9adffefb77388b1f935aa59f0bfb8 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -24,6 +24,9 @@ $TRANSLATIONS = array(
"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+"App directory already exists" => "El directorio de la aplicación ya existe",
+"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error de autenticación",
"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
@@ -32,7 +35,7 @@ $TRANSLATIONS = array(
"Images" => "Imágenes",
"%s enter the database username." => "%s ingresar el usuario de la base de datos.",
"%s enter the database name." => "%s ingresar el nombre de la base de datos",
-"%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos",
+"%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
@@ -51,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "año pasado",
"years ago" => "hace años",
"Caused by:" => "Causado por:",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 26f1e4ecd5e987253a07862e623c80c60ef609b2..f637eb403ed2113597517995ef7ecb8a3ed5036f 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud",
+"No app name specified" => "No fue especificado el nombre de la app",
"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Configuración",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Volver a Archivos",
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador",
+"No source specified when installing app" => "No se especificó el origen al instalar la app",
+"No href specified when installing app from http" => "No se especificó href al instalar la app",
+"No path specified when installing app from local file" => "No se especificó PATH al instalar la app desde el archivo local",
+"Archives of type %s are not supported" => "No hay soporte para archivos de tipo %s",
+"Failed to open archive when installing app" => "Error al abrir archivo mientras se instalaba la app",
+"App does not provide an info.xml file" => "La app no suministra un archivo info.xml",
+"App can't be installed because of not allowed code in the App" => "No puede ser instalada la app por tener código no autorizado",
+"App can't be installed because it is not compatible with this version of ownCloud" => "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
+"App directory already exists" => "El directorio de la app ya existe",
+"Can't create app folder. Please fix permissions. %s" => "No se puede crear el directorio para la app. Corregí los permisos. %s",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error al autenticar",
"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
@@ -40,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años atrás",
"Caused by:" => "Provocado por:",
diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_MX.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index b9ba71c402e0af68161cdf5052ebe5eb9b135111..da3ec4ce37283158ccf33055d2b27069948d086c 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,15 +1,32 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.",
+"No app name specified" => "Aucun nom d'application spécifié",
"Help" => "Aide",
"Personal" => "Personnel",
"Settings" => "Paramètres",
"Users" => "Utilisateurs",
"Admin" => "Administration",
+"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".",
"web services under your control" => "services web sous votre contrôle",
+"cannot open \"%s\"" => "impossible d'ouvrir \"%s\"",
"ZIP download is turned off." => "Téléchargement ZIP désactivé.",
"Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
"Back to Files" => "Retour aux Fichiers",
"Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur.",
+"No source specified when installing app" => "Aucune source spécifiée pour installer l'application",
+"No href specified when installing app from http" => "Aucun href spécifié pour installer l'application par http",
+"No path specified when installing app from local file" => "Aucun chemin spécifié pour installer l'application depuis un fichier local",
+"Archives of type %s are not supported" => "Les archives de type %s ne sont pas supportées",
+"Failed to open archive when installing app" => "Échec de l'ouverture de l'archive lors de l'installation de l'application",
+"App does not provide an info.xml file" => "L'application ne fournit pas de fichier info.xml",
+"App can't be installed because of not allowed code in the App" => "L'application ne peut être installée car elle contient du code non-autorisé",
+"App can't be installed because it is not compatible with this version of ownCloud" => "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store",
+"App directory already exists" => "Le dossier de l'application existe déjà",
+"Can't create app folder. Please fix permissions. %s" => "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
"Application is not enabled" => "L'application n'est pas activée",
"Authentication error" => "Erreur d'authentification",
"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
@@ -46,6 +63,7 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
+"Caused by:" => "Causé par :",
"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index e2b67e7618795ecfc5f3f7b47d448bd6b0a8c234..2d37001ca19ba8abd0da7aae65258b472f96e425 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません",
"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストール出来ません。",
"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません",
"App directory already exists" => "アプリディレクトリは既に存在します",
"Can't create app folder. Please fix permissions. %s" => "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。",
diff --git a/lib/l10n/km.php b/lib/l10n/km.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7b09649a240500e39096daf02b7cc137312f444
--- /dev/null
+++ b/lib/l10n/km.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 242b0a231063dfea2d15763918900aad3dbb8075..1fd9b9ea6346adcb594433c2823d5311ce7adfc9 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -1,30 +1,69 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija.",
+"No app name specified" => "Nenurodytas programos pavadinimas",
"Help" => "Pagalba",
"Personal" => "Asmeniniai",
"Settings" => "Nustatymai",
"Users" => "Vartotojai",
"Admin" => "Administravimas",
+"Failed to upgrade \"%s\"." => "Nepavyko pakelti „%s“ versijos.",
"web services under your control" => "jūsų valdomos web paslaugos",
+"cannot open \"%s\"" => "nepavyksta atverti „%s“",
"ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
"Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
"Back to Files" => "Atgal į Failus",
"Selected files too large to generate zip file." => "Pasirinkti failai per dideli archyvavimui į ZIP.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus.",
+"No source specified when installing app" => "Nenurodytas šaltinis diegiant programą",
+"No href specified when installing app from http" => "Nenurodytas href diegiant programą iš http",
+"No path specified when installing app from local file" => "Nenurodytas kelias diegiant programą iš vietinio failo",
+"Archives of type %s are not supported" => "%s tipo archyvai nepalaikomi",
+"Failed to open archive when installing app" => "Nepavyko atverti archyvo diegiant programą",
+"App does not provide an info.xml file" => "Programa nepateikia info.xml failo",
+"App can't be installed because of not allowed code in the App" => "Programa negali būti įdiegta, nes turi neleistiną kodą",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
+"App directory already exists" => "Programos aplankas jau egzistuoja",
+"Can't create app folder. Please fix permissions. %s" => "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s",
"Application is not enabled" => "Programa neįjungta",
"Authentication error" => "Autentikacijos klaida",
"Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
"Files" => "Failai",
"Text" => "Žinučių",
"Images" => "Paveikslėliai",
+"%s enter the database username." => "%s įrašykite duombazės naudotojo vardą.",
+"%s enter the database name." => "%s įrašykite duombazės pavadinimą.",
+"%s you may not use dots in the database name" => "%s negalite naudoti taškų duombazės pavadinime",
+"MS SQL username and/or password not valid: %s" => "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
+"You need to enter either an existing account or the administrator." => "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
+"MySQL username and/or password not valid" => "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis",
+"DB Error: \"%s\"" => "DB klaida: \"%s\"",
+"Offending command was: \"%s\"" => "Vykdyta komanda buvo: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL naudotojas '%s'@'localhost' jau egzistuoja.",
+"Drop this user from MySQL" => "Pašalinti šį naudotoją iš MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL naudotojas '%s'@'%%' jau egzistuoja",
+"Drop this user from MySQL." => "Pašalinti šį naudotoją iš MySQL.",
+"Oracle connection could not be established" => "Nepavyko sukurti Oracle ryšio",
+"Oracle username and/or password not valid" => "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
+"Offending command was: \"%s\", name: %s, password: %s" => "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
+"PostgreSQL username and/or password not valid" => "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
+"Set an admin username." => "Nustatyti administratoriaus naudotojo vardą.",
+"Set an admin password." => "Nustatyti administratoriaus slaptažodį.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+"Please double check the <a href='%s'>installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
"seconds ago" => "prieš sekundę",
-"_%n minute ago_::_%n minutes ago_" => array("",""," prieš %n minučių"),
-"_%n hour ago_::_%n hours ago_" => array("","","prieš %n valandų"),
+"_%n minute ago_::_%n minutes ago_" => array("prieš %n min.","Prieš % minutes","Prieš %n minučių"),
+"_%n hour ago_::_%n hours ago_" => array("Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"),
"today" => "šiandien",
"yesterday" => "vakar",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"),
"last month" => "praeitą mėnesį",
-"_%n month ago_::_%n months ago_" => array("","","prieš %n mėnesių"),
+"_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"),
"last year" => "praeitais metais",
-"years ago" => "prieš metus"
+"years ago" => "prieš metus",
+"Caused by:" => "Iššaukė:",
+"Could not find category \"%s\"" => "Nepavyko rasti kategorijos „%s“"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index 28b4f7b7d945b8d74cc0d9b68a9408a042a808df..d5da8c64415db73e0d19fe10d260d79e40cfd7a0 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -10,15 +10,15 @@ $TRANSLATIONS = array(
"Files" => "Filer",
"Text" => "Tekst",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
"seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutt sidan"),
+"_%n hour ago_::_%n hours ago_" => array("","%n timar sidan"),
"today" => "i dag",
"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n dagar sidan"),
"last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n månadar sidan"),
"last year" => "i fjor",
"years ago" => "år sidan"
);
diff --git a/lib/l10n/nqo.php b/lib/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7b09649a240500e39096daf02b7cc137312f444
--- /dev/null
+++ b/lib/l10n/nqo.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 984043aa0bea587021ffa75e1bdb51f21953a5a2..4acd735d692161c470719b7098b5ce6317727446 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud.",
+"No app name specified" => "Nie określono nazwy aplikacji",
"Help" => "Pomoc",
"Personal" => "Osobiste",
"Settings" => "Ustawienia",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Wróć do plików",
"Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.",
+"No source specified when installing app" => "Nie określono źródła podczas instalacji aplikacji",
+"No href specified when installing app from http" => "Nie określono linku skąd aplikacja ma być zainstalowana",
+"No path specified when installing app from local file" => "Nie określono lokalnego pliku z którego miała być instalowana aplikacja",
+"Archives of type %s are not supported" => "Typ archiwum %s nie jest obsługiwany",
+"Failed to open archive when installing app" => "Nie udało się otworzyć archiwum podczas instalacji aplikacji",
+"App does not provide an info.xml file" => "Aplikacja nie posiada pliku info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
+"App directory already exists" => "Katalog aplikacji już isnieje",
+"Can't create app folder. Please fix permissions. %s" => "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s",
"Application is not enabled" => "Aplikacja nie jest włączona",
"Authentication error" => "Błąd uwierzytelniania",
"Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
@@ -40,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
"seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
+"_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"),
"today" => "dziś",
"yesterday" => "wczoraj",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
"last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
"Caused by:" => "Spowodowane przez:",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index a2379ca4883d76afac2edb367797f87a7ab0fff9..72bc1f36a1e14b2e8549a107ce6e61d021604937 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -54,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","ha %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("","ha %n horas"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","ha %n dias"),
"last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","ha %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
"Caused by:" => "Causados por:",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index c8a2f78cbf5991460244534ef305bb41d167c207..bf540012249a3997a007f10ae5d33c33933c4b42 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
"seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
+"_%n hour ago_::_%n hours ago_" => array("","%n horas atrás"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n dias atrás"),
"last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
"Caused by:" => "Causado por:",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index c2447b7ea230371f3feb9887f4e9cb25b986bb36..edaa1df2b86b08b71afdb26cedca4bdfafe96f67 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -36,13 +36,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
"seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minuta më parë"),
+"_%n hour ago_::_%n hours ago_" => array("","%n orë më parë"),
"today" => "sot",
"yesterday" => "dje",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n ditë më parë"),
"last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n muaj më parë"),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 2d8268a1d74b2a08fbcd15cea3d25ff18e20fc34..4413d722731db4666d344c6b20cf9e9671fae073 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -191,7 +191,8 @@ class OC_Migration_Content{
if( !file_exists( $dir ) ) {
return false;
}
- if ($dirhandle = opendir($dir)) {
+ $dirhandle = opendir($dir);
+ if(is_resource($dirhandle)) {
while (false !== ( $file = readdir($dirhandle))) {
if (( $file != '.' ) && ( $file != '..' )) {
diff --git a/lib/notsquareexception.php b/lib/notsquareexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..03dba8fb25f216feb72519d9985e30e735c1d2c7
--- /dev/null
+++ b/lib/notsquareexception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class NotSquareException extends \Exception {
+}
diff --git a/lib/preview.php b/lib/preview.php
index b40ba191fbae27eb1b36444bc29eea543038568d..266f7795f12f420402c9809b67cbcc376e51444e 100755
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -42,6 +42,9 @@ class Preview {
private $scalingup;
//preview images object
+ /**
+ * @var \OC_Image
+ */
private $preview;
//preview providers
@@ -624,4 +627,4 @@ class Preview {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/lib/preview/movies.php b/lib/preview/movies.php
index e2a1b8edddc9664c90c27eb078a94ecdb0048837..c318137ff0e06b9ca24836b60455114938003954 100644
--- a/lib/preview/movies.php
+++ b/lib/preview/movies.php
@@ -9,10 +9,10 @@
namespace OC\Preview;
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
-$whichFFMPEG = shell_exec('which ffmpeg');
-$isFFMPEGAvailable = !empty($whichFFMPEG);
+$whichAVCONV = shell_exec('which avconv');
+$isAVCONVAvailable = !empty($whichAVCONV);
-if($isShellExecEnabled && $isFFMPEGAvailable) {
+if($isShellExecEnabled && $isAVCONVAvailable) {
class Movie extends Provider {
@@ -30,7 +30,7 @@ if($isShellExecEnabled && $isFFMPEGAvailable) {
file_put_contents($absPath, $firstmb);
//$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
- $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmpPath);
+ $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
shell_exec($cmd);
diff --git a/lib/previewmanager.php b/lib/previewmanager.php
new file mode 100755
index 0000000000000000000000000000000000000000..ac9a866a75b71d04f86afe114df11e4dbe58d89d
--- /dev/null
+++ b/lib/previewmanager.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller thomas.mueller@tmit.eu
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+namespace OC;
+
+use OCP\image;
+use OCP\IPreview;
+
+class PreviewManager implements IPreview {
+ /**
+ * @brief return a preview of a file
+ * @param string $file The path to the file where you want a thumbnail from
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+ * @return \OCP\Image
+ */
+ function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false)
+ {
+ $preview = new \OC\Preview('', '/', $file, $maxX, $maxY, $scaleUp);
+ return $preview->getPreview();
+ }
+
+ /**
+ * @brief returns true if the passed mime type is supported
+ * @param string $mimeType
+ * @return boolean
+ */
+ function isMimeSupported($mimeType = '*')
+ {
+ return \OC\Preview::isMimeSupported($mimeType);
+ }
+}
diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..d97c5c81848861b6b6aea43ea23bddfdcdc3f32b
--- /dev/null
+++ b/lib/public/appframework/app.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\AppFramework;
+
+
+/**
+ * Class App
+ * @package OCP\AppFramework
+ *
+ * Any application must inherit this call - all controller instances to be used are
+ * to be registered using IContainer::registerService
+ */
+class App {
+ public function __construct($appName) {
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName);
+ }
+
+ private $container;
+
+ /**
+ * @return IAppContainer
+ */
+ public function getContainer() {
+ return $this->container;
+ }
+
+ /**
+ * This function is called by the routing component to fire up the frameworks dispatch mechanism.
+ *
+ * Example code in routes.php of the task app:
+ * $this->create('tasks_index', '/')->get()->action(
+ * function($params){
+ * $app = new TaskApp();
+ * $app->dispatch('PageController', 'index', $params);
+ * }
+ * );
+ *
+ *
+ * Example for for TaskApp implementation:
+ * class TaskApp extends \OCP\AppFramework\App {
+ *
+ * public function __construct(){
+ * parent::__construct('tasks');
+ *
+ * $this->getContainer()->registerService('PageController', function(IAppContainer $c){
+ * $a = $c->query('API');
+ * $r = $c->query('Request');
+ * return new PageController($a, $r);
+ * });
+ * }
+ * }
+ *
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ */
+ public function dispatch($controllerName, $methodName, array $urlParams) {
+ \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container);
+ }
+}
diff --git a/lib/public/appframework/http/http.php b/lib/public/appframework/http/http.php
new file mode 100644
index 0000000000000000000000000000000000000000..9eafe782726ac58d78042a7dc90a439eb30b51aa
--- /dev/null
+++ b/lib/public/appframework/http/http.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+class Http {
+
+ const STATUS_CONTINUE = 100;
+ const STATUS_SWITCHING_PROTOCOLS = 101;
+ const STATUS_PROCESSING = 102;
+ const STATUS_OK = 200;
+ const STATUS_CREATED = 201;
+ const STATUS_ACCEPTED = 202;
+ const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+ const STATUS_NO_CONTENT = 204;
+ const STATUS_RESET_CONTENT = 205;
+ const STATUS_PARTIAL_CONTENT = 206;
+ const STATUS_MULTI_STATUS = 207;
+ const STATUS_ALREADY_REPORTED = 208;
+ const STATUS_IM_USED = 226;
+ const STATUS_MULTIPLE_CHOICES = 300;
+ const STATUS_MOVED_PERMANENTLY = 301;
+ const STATUS_FOUND = 302;
+ const STATUS_SEE_OTHER = 303;
+ const STATUS_NOT_MODIFIED = 304;
+ const STATUS_USE_PROXY = 305;
+ const STATUS_RESERVED = 306;
+ const STATUS_TEMPORARY_REDIRECT = 307;
+ const STATUS_BAD_REQUEST = 400;
+ const STATUS_UNAUTHORIZED = 401;
+ const STATUS_PAYMENT_REQUIRED = 402;
+ const STATUS_FORBIDDEN = 403;
+ const STATUS_NOT_FOUND = 404;
+ const STATUS_METHOD_NOT_ALLOWED = 405;
+ const STATUS_NOT_ACCEPTABLE = 406;
+ const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+ const STATUS_REQUEST_TIMEOUT = 408;
+ const STATUS_CONFLICT = 409;
+ const STATUS_GONE = 410;
+ const STATUS_LENGTH_REQUIRED = 411;
+ const STATUS_PRECONDITION_FAILED = 412;
+ const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+ const STATUS_REQUEST_URI_TOO_LONG = 414;
+ const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+ const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+ const STATUS_EXPECTATION_FAILED = 417;
+ const STATUS_IM_A_TEAPOT = 418;
+ const STATUS_UNPROCESSABLE_ENTITY = 422;
+ const STATUS_LOCKED = 423;
+ const STATUS_FAILED_DEPENDENCY = 424;
+ const STATUS_UPGRADE_REQUIRED = 426;
+ const STATUS_PRECONDITION_REQUIRED = 428;
+ const STATUS_TOO_MANY_REQUESTS = 429;
+ const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+ const STATUS_INTERNAL_SERVER_ERROR = 500;
+ const STATUS_NOT_IMPLEMENTED = 501;
+ const STATUS_BAD_GATEWAY = 502;
+ const STATUS_SERVICE_UNAVAILABLE = 503;
+ const STATUS_GATEWAY_TIMEOUT = 504;
+ const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+ const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+ const STATUS_INSUFFICIENT_STORAGE = 507;
+ const STATUS_LOOP_DETECTED = 508;
+ const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+ const STATUS_NOT_EXTENDED = 510;
+ const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+}
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..085fdbed2f9da300aa400bae218d35dde4176873
--- /dev/null
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+/**
+ * A renderer for JSON calls
+ */
+class JSONResponse extends Response {
+
+ protected $data;
+
+
+ /**
+ * @param array|object $data the object or array that should be transformed
+ * @param int $statusCode the Http status code, defaults to 200
+ */
+ public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+ $this->data = $data;
+ $this->setStatus($statusCode);
+ $this->addHeader('X-Content-Type-Options', 'nosniff');
+ $this->addHeader('Content-type', 'application/json; charset=utf-8');
+ }
+
+
+ /**
+ * Returns the rendered json
+ * @return string the rendered json
+ */
+ public function render(){
+ return json_encode($this->data);
+ }
+
+ /**
+ * Sets values in the data json array
+ * @param array|object $params an array or object which will be transformed
+ * to JSON
+ */
+ public function setData($data){
+ $this->data = $data;
+ }
+
+
+ /**
+ * Used to get the set parameters
+ * @return array the data
+ */
+ public function getData(){
+ return $this->data;
+ }
+
+}
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
new file mode 100644
index 0000000000000000000000000000000000000000..644772589484e1e1a0236e38ccb151f6ba4344ee
--- /dev/null
+++ b/lib/public/appframework/http/response.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+/**
+ * Base class for responses. Also used to just send headers
+ */
+class Response {
+
+ /**
+ * @var array default headers
+ */
+ private $headers = array(
+ 'Cache-Control' => 'no-cache, must-revalidate'
+ );
+
+
+ /**
+ * @var string
+ */
+ private $status = Http::STATUS_OK;
+
+
+ /**
+ * @var \DateTime
+ */
+ private $lastModified;
+
+
+ /**
+ * @var string
+ */
+ private $ETag;
+
+
+ /**
+ * Caches the response
+ * @param int $cacheSeconds the amount of seconds that should be cached
+ * if 0 then caching will be disabled
+ */
+ public function cacheFor($cacheSeconds) {
+
+ if($cacheSeconds > 0) {
+ $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds .
+ ', must-revalidate');
+ } else {
+ $this->addHeader('Cache-Control', 'no-cache, must-revalidate');
+ }
+
+ }
+
+
+ /**
+ * Adds a new header to the response that will be called before the render
+ * function
+ * @param string $name The name of the HTTP header
+ * @param string $value The value, null will delete it
+ */
+ public function addHeader($name, $value) {
+ if(is_null($value)) {
+ unset($this->headers[$name]);
+ } else {
+ $this->headers[$name] = $value;
+ }
+ }
+
+
+ /**
+ * Returns the set headers
+ * @return array the headers
+ */
+ public function getHeaders() {
+ $mergeWith = array();
+
+ if($this->lastModified) {
+ $mergeWith['Last-Modified'] =
+ $this->lastModified->format(\DateTime::RFC2822);
+ }
+
+ if($this->ETag) {
+ $mergeWith['ETag'] = '"' . $this->ETag . '"';
+ }
+
+ return array_merge($mergeWith, $this->headers);
+ }
+
+
+ /**
+ * By default renders no output
+ * @return null
+ */
+ public function render() {
+ return null;
+ }
+
+
+ /**
+ * Set response status
+ * @param int $status a HTTP status code, see also the STATUS constants
+ */
+ public function setStatus($status) {
+ $this->status = $status;
+ }
+
+
+ /**
+ * Get response status
+ */
+ public function getStatus() {
+ return $this->status;
+ }
+
+
+ /**
+ * @return string the etag
+ */
+ public function getETag() {
+ return $this->ETag;
+ }
+
+
+ /**
+ * @return string RFC2822 formatted last modified date
+ */
+ public function getLastModified() {
+ return $this->lastModified;
+ }
+
+
+ /**
+ * @param string $ETag
+ */
+ public function setETag($ETag) {
+ $this->ETag = $ETag;
+ }
+
+
+ /**
+ * @param \DateTime $lastModified
+ */
+ public function setLastModified($lastModified) {
+ $this->lastModified = $lastModified;
+ }
+
+
+}
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..97678c96cbaffb6cc592516fe6b3c2b0e3235350
--- /dev/null
+++ b/lib/public/appframework/http/templateresponse.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+use OC\AppFramework\Core\API;
+
+
+/**
+ * Response for a normal template
+ */
+class TemplateResponse extends Response {
+
+ protected $templateName;
+ protected $params;
+ protected $api;
+ protected $renderAs;
+ protected $appName;
+
+ /**
+ * @param API $api an API instance
+ * @param string $templateName the name of the template
+ * @param string $appName optional if you want to include a template from
+ * a different app
+ */
+ public function __construct(API $api, $templateName, $appName=null) {
+ $this->templateName = $templateName;
+ $this->appName = $appName;
+ $this->api = $api;
+ $this->params = array();
+ $this->renderAs = 'user';
+ }
+
+
+ /**
+ * Sets template parameters
+ * @param array $params an array with key => value structure which sets template
+ * variables
+ */
+ public function setParams(array $params){
+ $this->params = $params;
+ }
+
+
+ /**
+ * Used for accessing the set parameters
+ * @return array the params
+ */
+ public function getParams(){
+ return $this->params;
+ }
+
+
+ /**
+ * Used for accessing the name of the set template
+ * @return string the name of the used template
+ */
+ public function getTemplateName(){
+ return $this->templateName;
+ }
+
+
+ /**
+ * Sets the template page
+ * @param string $renderAs admin, user or blank. Admin also prints the admin
+ * settings header and footer, user renders the normal
+ * normal page including footer and header and blank
+ * just renders the plain template
+ */
+ public function renderAs($renderAs){
+ $this->renderAs = $renderAs;
+ }
+
+
+ /**
+ * Returns the set renderAs
+ * @return string the renderAs value
+ */
+ public function getRenderAs(){
+ return $this->renderAs;
+ }
+
+
+ /**
+ * Returns the rendered html
+ * @return string the rendered html
+ */
+ public function render(){
+
+ if($this->appName !== null){
+ $appName = $this->appName;
+ } else {
+ $appName = $this->api->getAppName();
+ }
+
+ $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName);
+
+ foreach($this->params as $key => $value){
+ $template->assign($key, $value);
+ }
+
+ return $template->fetchPage();
+ }
+
+}
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
new file mode 100644
index 0000000000000000000000000000000000000000..5374f0dcaf5cc3ee046291621ccab748f9d16809
--- /dev/null
+++ b/lib/public/appframework/iapi.php
@@ -0,0 +1,238 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+
+
+/**
+ * A few very basic and frequently used API functions are combined in here
+ */
+interface IApi {
+
+ /**
+ * used to return the appname of the set application
+ * @return string the name of your application
+ */
+ function getAppName();
+
+
+ /**
+ * Creates a new navigation entry
+ * @param array $entry containing: id, name, order, icon and href key
+ */
+ function addNavigationEntry(array $entry);
+
+
+ /**
+ * Gets the userid of the current user
+ * @return string the user id of the current user
+ */
+ function getUserId();
+
+
+ /**
+ * Sets the current navigation entry to the currently running app
+ */
+ function activateNavigationEntry();
+
+
+ /**
+ * Adds a new javascript file
+ * @param string $scriptName the name of the javascript in js/ without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function addScript($scriptName, $appName = null);
+
+
+ /**
+ * Adds a new css file
+ * @param string $styleName the name of the css file in css/without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function addStyle($styleName, $appName = null);
+
+
+ /**
+ * shorthand for addScript for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ function add3rdPartyScript($name);
+
+
+ /**
+ * shorthand for addStyle for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ function add3rdPartyStyle($name);
+
+ /**
+ * Looks up a system-wide defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ function getSystemValue($key);
+
+ /**
+ * Sets a new system-wide value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ function setSystemValue($key, $value);
+
+
+ /**
+ * Looks up an app-specific defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ function getAppValue($key, $appName = null);
+
+
+ /**
+ * Writes a new app-specific value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ function setAppValue($key, $value, $appName = null);
+
+
+ /**
+ * Shortcut for setting a user defined value
+ * @param string $key the key under which the value is being stored
+ * @param string $value the value that you want to store
+ * @param string $userId the userId of the user that we want to store the value under, defaults to the current one
+ */
+ function setUserValue($key, $value, $userId = null);
+
+
+ /**
+ * Shortcut for getting a user defined value
+ * @param string $key the key under which the value is being stored
+ * @param string $userId the userId of the user that we want to store the value under, defaults to the current one
+ */
+ function getUserValue($key, $userId = null);
+
+ /**
+ * Returns the translation object
+ * @return \OC_L10N the translation object
+ *
+ * FIXME: returns private object / should be retrieved from teh ServerContainer
+ */
+ function getTrans();
+
+
+ /**
+ * 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 \OCP\DB a query object
+ *
+ * FIXME: returns non public interface / object
+ */
+ 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
+ *
+ * FIXME: move to db object
+ */
+ function getInsertId($tableName);
+
+
+ /**
+ * Returns the URL for a route
+ * @param string $routeName the name of the route
+ * @param array $arguments an array with arguments which will be filled into the url
+ * @return string the url
+ */
+ function linkToRoute($routeName, $arguments=array());
+
+
+ /**
+ * Returns an URL for an image or file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function linkTo($file, $appName=null);
+
+
+ /**
+ * Returns the link to an image, like link to but only with prepending img/
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function imagePath($file, $appName = null);
+
+
+ /**
+ * Makes an URL absolute
+ * @param string $url the url
+ * @return string the absolute url
+ *
+ * FIXME: function should live in Request / Response
+ */
+ function getAbsoluteURL($url);
+
+
+ /**
+ * links to a file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ * @deprecated replaced with linkToRoute()
+ * @return string the url
+ */
+ function linkToAbsolute($file, $appName = null);
+
+
+ /**
+ * Checks if an app is enabled
+ * @param string $appName the name of an app
+ * @return bool true if app is enabled
+ */
+ public function isAppEnabled($appName);
+
+
+ /**
+ * Writes a function into the error log
+ * @param string $msg the error message to be logged
+ * @param int $level the error level
+ *
+ * FIXME: add logger instance to ServerContainer
+ */
+ function log($msg, $level = null);
+
+
+ /**
+ * Returns a template
+ * @param string $templateName the name of the template
+ * @param string $renderAs how it should be rendered
+ * @param string $appName the name of the app
+ * @return \OCP\Template a new template
+ */
+ function getTemplate($templateName, $renderAs='user', $appName=null);
+}
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8f6229dd9ee23184f7f710e9d2c827bb6fc84f8
--- /dev/null
+++ b/lib/public/appframework/iappcontainer.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\AppFramework;
+
+use OCP\AppFramework\IApi;
+use OCP\IContainer;
+
+/**
+ * Class IAppContainer
+ * @package OCP\AppFramework
+ *
+ * This container interface provides short cuts for app developers to access predefined app service.
+ */
+interface IAppContainer extends IContainer{
+
+ /**
+ * @return IApi
+ */
+ function getCoreApi();
+
+ /**
+ * @return \OCP\IServerContainer
+ */
+ function getServer();
+}
diff --git a/lib/public/appframework/imiddleware.php b/lib/public/appframework/imiddleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e76d3bbe499d75e2541360fdad3422bf5b3a922
--- /dev/null
+++ b/lib/public/appframework/imiddleware.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Middleware is used to provide hooks before or after controller methods and
+ * deal with possible exceptions raised in the controller methods.
+ * They're modeled after Django's middleware system:
+ * https://docs.djangoproject.com/en/dev/topics/http/middleware/
+ */
+interface IMiddleWare {
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ function beforeController($controller, $methodName);
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is
+ * asked in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object in case that the exception was handled
+ */
+ function afterException($controller, $methodName, \Exception $exception);
+
+ /**
+ * This is being run after a successful controller method call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ function afterController($controller, $methodName, Response $response);
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ function beforeOutput($controller, $methodName, $output);
+}
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 88d812e735a857b79e47cb85b712ab9801836711..1b61d7aa4ff22b6201a8bfe407eaec0b7f8ddf9b 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -90,13 +90,8 @@ namespace OCP {
* @return array of contacts which are arrays of key-value-pairs
*/
public static function search($pattern, $searchProperties = array(), $options = array()) {
- $result = array();
- foreach(self::$address_books as $address_book) {
- $r = $address_book->search($pattern, $searchProperties, $options);
- $result = array_merge($result, $r);
- }
-
- return $result;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->search($pattern, $searchProperties, $options);
}
/**
@@ -107,14 +102,8 @@ namespace OCP {
* @return bool successful or not
*/
public static function delete($id, $address_book_key) {
- if (!array_key_exists($address_book_key, self::$address_books))
- return null;
-
- $address_book = self::$address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
- return null;
-
- return $address_book->delete($id);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->delete($id, $address_book_key);
}
/**
@@ -126,15 +115,8 @@ namespace OCP {
* @return array representing the contact just created or updated
*/
public static function createOrUpdate($properties, $address_book_key) {
-
- if (!array_key_exists($address_book_key, self::$address_books))
- return null;
-
- $address_book = self::$address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
- return null;
-
- return $address_book->createOrUpdate($properties);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->search($properties, $address_book_key);
}
/**
@@ -143,45 +125,40 @@ namespace OCP {
* @return bool true if enabled, false if not
*/
public static function isEnabled() {
- return !empty(self::$address_books);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->isEnabled();
}
/**
* @param \OCP\IAddressBook $address_book
*/
public static function registerAddressBook(\OCP\IAddressBook $address_book) {
- self::$address_books[$address_book->getKey()] = $address_book;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->registerAddressBook($address_book);
}
/**
* @param \OCP\IAddressBook $address_book
*/
public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
- unset(self::$address_books[$address_book->getKey()]);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->unregisterAddressBook($address_book);
}
/**
* @return array
*/
public static function getAddressBooks() {
- $result = array();
- foreach(self::$address_books as $address_book) {
- $result[$address_book->getKey()] = $address_book->getDisplayName();
- }
-
- return $result;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->getAddressBooks();
}
/**
* removes all registered address book instances
*/
public static function clear() {
- self::$address_books = array();
+ $cm = \OC::$server->getContactsManager();
+ $cm->clear();
}
-
- /**
- * @var \OCP\IAddressBook[] which holds all registered address books
- */
- private static $address_books = array();
}
}
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..3bfbca7be501ecee5b502277a3ae74294e2c6315
--- /dev/null
+++ b/lib/public/contacts/imanager.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * Contacts Class
+ *
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP\Contacts {
+
+ /**
+ * This class provides access to the contacts app. Use this class exclusively if you want to access contacts.
+ *
+ * Contacts in general will be expressed as an array of key-value-pairs.
+ * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
+ *
+ * Proposed workflow for working with contacts:
+ * - search for the contacts
+ * - manipulate the results array
+ * - createOrUpdate will save the given contacts overwriting the existing data
+ *
+ * For updating it is mandatory to keep the id.
+ * Without an id a new contact will be created.
+ *
+ */
+ interface IManager {
+
+ /**
+ * This function is used to search and find contacts within the users address books.
+ * In case $pattern is empty all contacts will be returned.
+ *
+ * Example:
+ * Following function shows how to search for contacts for the name and the email address.
+ *
+ * public static function getMatchingRecipient($term) {
+ * $cm = \OC::$server->getContactsManager();
+ * // The API is not active -> nothing to do
+ * if (!$cm->isEnabled()) {
+ * return array();
+ * }
+ *
+ * $result = $cm->search($term, array('FN', 'EMAIL'));
+ * $receivers = array();
+ * foreach ($result as $r) {
+ * $id = $r['id'];
+ * $fn = $r['FN'];
+ * $email = $r['EMAIL'];
+ * if (!is_array($email)) {
+ * $email = array($email);
+ * }
+ *
+ * // loop through all email addresses of this contact
+ * foreach ($email as $e) {
+ * $displayName = $fn . " <$e>";
+ * $receivers[] = array(
+ * 'id' => $id,
+ * 'label' => $displayName,
+ * 'value' => $displayName);
+ * }
+ * }
+ *
+ * return $receivers;
+ * }
+ *
+ *
+ * @param string $pattern which should match within the $searchProperties
+ * @param array $searchProperties defines the properties within the query pattern should match
+ * @param array $options - for future use. One should always have options!
+ * @return array of contacts which are arrays of key-value-pairs
+ */
+ function search($pattern, $searchProperties = array(), $options = array());
+
+ /**
+ * This function can be used to delete the contact identified by the given id
+ *
+ * @param object $id the unique identifier to a contact
+ * @param $address_book_key
+ * @return bool successful or not
+ */
+ function delete($id, $address_book_key);
+
+ /**
+ * This function is used to create a new contact if 'id' is not given or not present.
+ * Otherwise the contact will be updated by replacing the entire data set.
+ *
+ * @param array $properties this array if key-value-pairs defines a contact
+ * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+ * @return array representing the contact just created or updated
+ */
+ function createOrUpdate($properties, $address_book_key);
+
+ /**
+ * Check if contacts are available (e.g. contacts app enabled)
+ *
+ * @return bool true if enabled, false if not
+ */
+ function isEnabled();
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ function registerAddressBook(\OCP\IAddressBook $address_book);
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ function unregisterAddressBook(\OCP\IAddressBook $address_book);
+
+ /**
+ * In order to improve lazy loading a closure can be registered which will be called in case
+ * address books are actually requested
+ *
+ * @param string $key
+ * @param \Closure $callable
+ */
+ function register($key, \Closure $callable);
+
+ /**
+ * @return array
+ */
+ function getAddressBooks();
+
+ /**
+ * removes all registered address book instances
+ */
+ function clear();
+ }
+}
diff --git a/lib/public/db.php b/lib/public/db.php
index 932e79d9ef1755828ea34751881911d47a3ad4e2..9512cca2d19d30398eb85de376b80fef6630b686 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -102,4 +102,15 @@ class DB {
public static function isError($result) {
return(\OC_DB::isError($result));
}
+
+ /**
+ * returns the error code and message as a string for logging
+ * works with DoctrineException
+ * @param mixed $error
+ * @return string
+ */
+ public static function getErrorMessage($error) {
+ return(\OC_DB::getErrorMessage($error));
+ }
+
}
diff --git a/lib/public/files/alreadyexistsexception.php b/lib/public/files/alreadyexistsexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..32947c7a5c309614eee6dd9e9b2a0ee904e730a5
--- /dev/null
+++ b/lib/public/files/alreadyexistsexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class AlreadyExistsException extends \Exception {}
diff --git a/lib/public/files/file.php b/lib/public/files/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..916b2edd6c45ab44259debc25797a269c5360da8
--- /dev/null
+++ b/lib/public/files/file.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface File extends Node {
+ /**
+ * Get the content of the file as string
+ *
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getContent();
+
+ /**
+ * Write to the file from string data
+ *
+ * @param string $data
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function putContent($data);
+
+ /**
+ * Get the mimetype of the file
+ *
+ * @return string
+ */
+ public function getMimeType();
+
+ /**
+ * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen
+ *
+ * @param string $mode
+ * @return resource
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function fopen($mode);
+
+ /**
+ * Compute the hash of the file
+ * Type of hash is set with $type and can be anything supported by php's hash_file
+ *
+ * @param string $type
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $raw = false);
+}
diff --git a/lib/public/files/folder.php b/lib/public/files/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..da7f20fd3666afec5117a0c032123201bebeb071
--- /dev/null
+++ b/lib/public/files/folder.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface Folder extends Node {
+ /**
+ * Get the full path of an item in the folder within owncloud's filesystem
+ *
+ * @param string $path relative path of an item in the folder
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getFullPath($path);
+
+ /**
+ * Get the path of an item in the folder relative to the folder
+ *
+ * @param string $path absolute path of an item in the folder
+ * @throws \OCP\Files\NotFoundException
+ * @return string
+ */
+ public function getRelativePath($path);
+
+ /**
+ * check if a node is a (grand-)child of the folder
+ *
+ * @param \OCP\Files\Node $node
+ * @return bool
+ */
+ public function isSubNode($node);
+
+ /**
+ * get the content of this directory
+ *
+ * @throws \OCP\Files\NotFoundException
+ * @return \OCP\Files\Node[]
+ */
+ public function getDirectoryListing();
+
+ /**
+ * Get the node at $path
+ *
+ * @param string $path relative path of the file or folder
+ * @return \OCP\Files\Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function get($path);
+
+ /**
+ * Check if a file or folder exists in the folder
+ *
+ * @param string $path relative path of the file or folder
+ * @return bool
+ */
+ public function nodeExists($path);
+
+ /**
+ * Create a new folder
+ *
+ * @param string $path relative path of the new folder
+ * @return \OCP\Files\Folder
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFolder($path);
+
+ /**
+ * Create a new file
+ *
+ * @param string $path relative path of the new file
+ * @return \OCP\Files\File
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFile($path);
+
+ /**
+ * search for files with the name matching $query
+ *
+ * @param string $query
+ * @return \OCP\Files\Node[]
+ */
+ public function search($query);
+
+ /**
+ * search for files by mimetype
+ * $mimetype can either be a full mimetype (image/png) or a wildcard mimetype (image)
+ *
+ * @param string $mimetype
+ * @return \OCP\Files\Node[]
+ */
+ public function searchByMime($mimetype);
+
+ /**
+ * get a file or folder inside the folder by it's internal id
+ *
+ * @param int $id
+ * @return \OCP\Files\Node[]
+ */
+ public function getById($id);
+
+ /**
+ * Get the amount of free space inside the folder
+ *
+ * @return int
+ */
+ public function getFreeSpace();
+
+ /**
+ * Check if new files or folders can be created within the folder
+ *
+ * @return bool
+ */
+ public function isCreatable();
+}
diff --git a/lib/public/files/node.php b/lib/public/files/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3ddf6de6212bee19708747caa32fb02debf853f
--- /dev/null
+++ b/lib/public/files/node.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface Node {
+ /**
+ * Move the file or folder to a new location
+ *
+ * @param string $targetPath the absolute target path
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OCP\Files\Node
+ */
+ public function move($targetPath);
+
+ /**
+ * Delete the file or folder
+ */
+ public function delete();
+
+ /**
+ * Cope the file or folder to a new location
+ *
+ * @param string $targetPath the absolute target path
+ * @return \OCP\Files\Node
+ */
+ public function copy($targetPath);
+
+ /**
+ * Change the modified date of the file or folder
+ * If $mtime is omitted the current time will be used
+ *
+ * @param int $mtime (optional) modified date as unix timestamp
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null);
+
+ /**
+ * Get the storage backend the file or folder is stored on
+ *
+ * @return \OCP\Files\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage();
+
+ /**
+ * Get the full path of the file or folder
+ *
+ * @return string
+ */
+ public function getPath();
+
+ /**
+ * Get the path of the file or folder relative to the mountpoint of it's storage
+ *
+ * @return string
+ */
+ public function getInternalPath();
+
+ /**
+ * Get the internal file id for the file or folder
+ *
+ * @return int
+ */
+ public function getId();
+
+ /**
+ * Get metadata of the file or folder
+ * The returned array contains the following values:
+ * - mtime
+ * - size
+ *
+ * @return array
+ */
+ public function stat();
+
+ /**
+ * Get the modified date of the file or folder as unix timestamp
+ *
+ * @return int
+ */
+ public function getMTime();
+
+ /**
+ * Get the size of the file or folder in bytes
+ *
+ * @return int
+ */
+ public function getSize();
+
+ /**
+ * Get the Etag of the file or folder
+ * The Etag is an string id used to detect changes to a file or folder,
+ * every time the file or folder is changed the Etag will change to
+ *
+ * @return string
+ */
+ public function getEtag();
+
+
+ /**
+ * Get the permissions of the file or folder as a combination of one or more of the following constants:
+ * - \OCP\PERMISSION_READ
+ * - \OCP\PERMISSION_UPDATE
+ * - \OCP\PERMISSION_CREATE
+ * - \OCP\PERMISSION_DELETE
+ * - \OCP\PERMISSION_SHARE
+ *
+ * @return int
+ */
+ public function getPermissions();
+
+ /**
+ * Check if the file or folder is readable
+ *
+ * @return bool
+ */
+ public function isReadable();
+
+ /**
+ * Check if the file or folder is writable
+ *
+ * @return bool
+ */
+ public function isUpdateable();
+
+ /**
+ * Check if the file or folder is deletable
+ *
+ * @return bool
+ */
+ public function isDeletable();
+
+ /**
+ * Check if the file or folder is shareable
+ *
+ * @return bool
+ */
+ public function isShareable();
+
+ /**
+ * Get the parent folder of the file or folder
+ *
+ * @return Folder
+ */
+ public function getParent();
+
+ /**
+ * Get the filename of the file or folder
+ *
+ * @return string
+ */
+ public function getName();
+}
diff --git a/lib/public/files/notenoughspaceexception.php b/lib/public/files/notenoughspaceexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..e51806666ad139e2c3b9c3e91b1d3738c9fc7d0e
--- /dev/null
+++ b/lib/public/files/notenoughspaceexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotEnoughSpaceException extends \Exception {}
diff --git a/lib/public/files/notfoundexception.php b/lib/public/files/notfoundexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..1ff426a40c6e405a0c5c9ffa812c747b230add73
--- /dev/null
+++ b/lib/public/files/notfoundexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotFoundException extends \Exception {}
diff --git a/lib/public/files/notpermittedexception.php b/lib/public/files/notpermittedexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..0509de7e8291b580d01f948c4253929c8f7f6ae3
--- /dev/null
+++ b/lib/public/files/notpermittedexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotPermittedException extends \Exception {}
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
new file mode 100644
index 0000000000000000000000000000000000000000..f32f20734836c998803ddbb52dee3135241d636a
--- /dev/null
+++ b/lib/public/files/storage.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+/**
+ * Provide a common interface to all different storage options
+ *
+ * All paths passed to the storage are relative to the storage and should NOT have a leading slash.
+ */
+interface Storage {
+ /**
+ * $parameters is a free form array with the configuration options needed to construct the storage
+ *
+ * @param array $parameters
+ */
+ public function __construct($parameters);
+
+ /**
+ * Get the identifier for the storage,
+ * the returned id should be the same for every storage object that is created with the same parameters
+ * and two storage objects with the same id should refer to two storages that display the same files.
+ *
+ * @return string
+ */
+ public function getId();
+
+ /**
+ * see http://php.net/manual/en/function.mkdir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function mkdir($path);
+
+ /**
+ * see http://php.net/manual/en/function.rmdir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function rmdir($path);
+
+ /**
+ * see http://php.net/manual/en/function.opendir.php
+ *
+ * @param string $path
+ * @return resource
+ */
+ public function opendir($path);
+
+ /**
+ * see http://php.net/manual/en/function.is_dir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function is_dir($path);
+
+ /**
+ * see http://php.net/manual/en/function.is_file.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function is_file($path);
+
+ /**
+ * see http://php.net/manual/en/function.stat.php
+ * only the following keys are required in the result: size and mtime
+ *
+ * @param string $path
+ * @return array
+ */
+ public function stat($path);
+
+ /**
+ * see http://php.net/manual/en/function.filetype.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function filetype($path);
+
+ /**
+ * see http://php.net/manual/en/function.filesize.php
+ * The result for filesize when called on a folder is required to be 0
+ *
+ * @param string $path
+ * @return int
+ */
+ public function filesize($path);
+
+ /**
+ * check if a file can be created in $path
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isCreatable($path);
+
+ /**
+ * check if a file can be read
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isReadable($path);
+
+ /**
+ * check if a file can be written to
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isUpdatable($path);
+
+ /**
+ * check if a file can be deleted
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isDeletable($path);
+
+ /**
+ * check if a file can be shared
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isSharable($path);
+
+ /**
+ * get the full permissions of a path.
+ * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function getPermissions($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_exists.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function file_exists($path);
+
+ /**
+ * see http://php.net/manual/en/function.filemtime.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function filemtime($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_get_contents.php
+ *
+ * @param string $path
+ * @return string
+ */
+ public function file_get_contents($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_put_contents.php
+ *
+ * @param string $path
+ * @param string $data
+ * @return bool
+ */
+ public function file_put_contents($path, $data);
+
+ /**
+ * see http://php.net/manual/en/function.unlink.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function unlink($path);
+
+ /**
+ * see http://php.net/manual/en/function.rename.php
+ *
+ * @param string $path1
+ * @param string $path2
+ * @return bool
+ */
+ public function rename($path1, $path2);
+
+ /**
+ * see http://php.net/manual/en/function.copy.php
+ *
+ * @param string $path1
+ * @param string $path2
+ * @return bool
+ */
+ public function copy($path1, $path2);
+
+ /**
+ * see http://php.net/manual/en/function.fopen.php
+ *
+ * @param string $path
+ * @param string $mode
+ * @return resource
+ */
+ public function fopen($path, $mode);
+
+ /**
+ * get the mimetype for a file or folder
+ * The mimetype for a folder is required to be "httpd/unix-directory"
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getMimeType($path);
+
+ /**
+ * see http://php.net/manual/en/function.hash-file.php
+ *
+ * @param string $type
+ * @param string $path
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $path, $raw = false);
+
+ /**
+ * see http://php.net/manual/en/function.free_space.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function free_space($path);
+
+ /**
+ * search for occurrences of $query in file names
+ *
+ * @param string $query
+ * @return array
+ */
+ public function search($query);
+
+ /**
+ * see http://php.net/manual/en/function.touch.php
+ * If the backend does not support the operation, false should be returned
+ *
+ * @param string $path
+ * @param int $mtime
+ * @return bool
+ */
+ public function touch($path, $mtime = null);
+
+ /**
+ * get the path to a local version of the file.
+ * The local version of the file can be temporary and doesn't have to be persistent across requests
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getLocalFile($path);
+
+ /**
+ * get the path to a local version of the folder.
+ * The local version of the folder can be temporary and doesn't have to be persistent across requests
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getLocalFolder($path);
+ /**
+ * check if a file or folder has been updated since $time
+ *
+ * @param string $path
+ * @param int $time
+ * @return bool
+ *
+ * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+ * returning true for other changes in the folder is optional
+ */
+ public function hasUpdated($path, $time);
+
+ /**
+ * get the ETag for a file or folder
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getETag($path);
+}
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..d43c1c90f11dbca405f259a442a3d829cfbae509
--- /dev/null
+++ b/lib/public/icontainer.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class IContainer
+ *
+ * IContainer is the basic interface to be used for any internal dependency injection mechanism
+ *
+ * @package OCP
+ */
+interface IContainer {
+
+ /**
+ * Look up a service for a given name in the container.
+ *
+ * @param string $name
+ * @return mixed
+ */
+ function query($name);
+
+ /**
+ * A value is stored in the container with it's corresponding name
+ *
+ * @param string $name
+ * @param mixed $value
+ * @return void
+ */
+ function registerParameter($name, $value);
+
+ /**
+ * A service is registered in the container where a closure is passed in which will actually
+ * create the service on demand.
+ * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+ * memory and be reused on subsequent calls.
+ * In case the parameter is false the service will be recreated on every call.
+ *
+ * @param string $name
+ * @param callable $closure
+ * @param bool $shared
+ * @return void
+ */
+ function registerService($name, \Closure $closure, $shared = true);
+}
diff --git a/lib/public/ipreview.php b/lib/public/ipreview.php
new file mode 100644
index 0000000000000000000000000000000000000000..b01e7f5b539918f7cee5549af7233080511daabe
--- /dev/null
+++ b/lib/public/ipreview.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OCP;
+
+/**
+ * This class provides functions to render and show thumbnails and previews of files
+ */
+interface IPreview
+{
+
+ /**
+ * @brief return a preview of a file
+ * @param string $file The path to the file where you want a thumbnail from
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+ * @return \OCP\Image
+ */
+ function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
+
+
+ /**
+ * @brief returns true if the passed mime type is supported
+ * @param string $mimeType
+ * @return boolean
+ */
+ function isMimeSupported($mimeType = '*');
+
+}
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..cd39855950bc875324dbb8e5e8dbf782829c016c
--- /dev/null
+++ b/lib/public/irequest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP;
+
+
+interface IRequest {
+
+ function getHeader($name);
+
+ /**
+ * Lets you access post and get parameters by the index
+ * In case of json requests the encoded json body is accessed
+ *
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function getParam($key, $default = null);
+
+
+ /**
+ * Returns all params that were received, be it from the request
+ *
+ * (as GET or POST) or through the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams();
+
+ /**
+ * Returns the method of the request
+ *
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function getMethod();
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ *
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key);
+
+
+ /**
+ * Shortcut for getting env variables
+ *
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function getEnv($key);
+
+
+ /**
+ * Shortcut for getting session variables
+ *
+ * @param string $key the key that will be taken from the $_SESSION array
+ * @return array the value in the $_SESSION element
+ */
+ function getSession($key);
+
+
+ /**
+ * Shortcut for getting cookie variables
+ *
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ function getCookie($key);
+
+
+ /**
+ * Returns the request body content.
+ *
+ * @param Boolean $asResource If true, a resource will be returned
+ * @return string|resource The request body content or a resource to read the body stream.
+ * @throws \LogicException
+ */
+ function getContent($asResource = false);
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..d88330698dc766dc1709f4846e4e85fafff28451
--- /dev/null
+++ b/lib/public/iservercontainer.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP;
+
+
+/**
+ * Class IServerContainer
+ * @package OCP
+ *
+ * This container holds all ownCloud services
+ */
+interface IServerContainer {
+
+ /**
+ * The contacts manager will act as a broker between consumers for contacts information and
+ * providers which actual deliver the contact information.
+ *
+ * @return \OCP\Contacts\IManager
+ */
+ function getContactsManager();
+
+ /**
+ * The current request object holding all information about the request currently being processed
+ * is returned from this method.
+ * In case the current execution was not initiated by a web request null is returned
+ *
+ * @return \OCP\IRequest|null
+ */
+ function getRequest();
+
+ /**
+ * Returns the preview manager which can create preview images for a given file
+ *
+ * @return \OCP\IPreview
+ */
+ function getPreviewManager();
+
+ /**
+ * Returns the root folder of ownCloud's data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getRootFolder();
+
+}
diff --git a/lib/public/preview.php b/lib/public/preview.php
deleted file mode 100644
index 7588347eccb76d88822b9d7babbcf6d39153c2c2..0000000000000000000000000000000000000000
--- a/lib/public/preview.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
- * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-namespace OCP;
-
-/**
- * This class provides functions to render and show thumbnails and previews of files
- */
-class Preview {
-
- /**
- * @brief return a preview of a file
- * @param $file The path to the file where you want a thumbnail from
- * @param $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
- * @param $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
- * @param $scaleup Scale smaller images up to the thumbnail size or not. Might look ugly
- * @return image
- */
- public static function show($file,$maxX=100,$maxY=75,$scaleup=false) {
- return(\OC\Preview::show($file,$maxX,$maxY,$scaleup));
- }
-
-
-
- public static function isMimeSupported($mimetype='*') {
- return \OC\Preview::isMimeSupported($mimetype);
- }
-
-}
diff --git a/lib/public/share.php b/lib/public/share.php
index b38208bc67fcfdce4f09952f33d7fdab2c162e07..9ab956d84b9a79616fb66647a54454ce899866f3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -140,8 +140,13 @@ class Share {
$source = -1;
$cache = false;
- $view = new \OC\Files\View('/' . $user . '/files/');
- $meta = $view->getFileInfo(\OC\Files\Filesystem::normalizePath($path));
+ $view = new \OC\Files\View('/' . $user . '/files');
+ if ($view->file_exists($path)) {
+ $meta = $view->getFileInfo($path);
+ } else {
+ // if the file doesn't exists yet we start with the parent folder
+ $meta = $view->getFileInfo(dirname($path));
+ }
if($meta !== false) {
$source = $meta['fileid'];
@@ -463,7 +468,7 @@ class Share {
if (isset($oldToken)) {
$token = $oldToken;
} else {
- $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH);
+ $token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
}
$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
null, $token);
diff --git a/lib/server.php b/lib/server.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e87bd3190d514a6cace4cd895ed508edbffca43
--- /dev/null
+++ b/lib/server.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace OC;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\Files\Node\Root;
+use OC\Files\View;
+use OCP\IServerContainer;
+
+/**
+ * Class Server
+ * @package OC
+ *
+ * TODO: hookup all manager classes
+ */
+class Server extends SimpleContainer implements IServerContainer {
+
+ function __construct() {
+ $this->registerService('ContactsManager', function($c){
+ return new ContactsManager();
+ });
+ $this->registerService('Request', function($c){
+ $params = array();
+
+ // we json decode the body only in case of content type json
+ if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') === true ) {
+ $params = json_decode(file_get_contents('php://input'), true);
+ $params = is_array($params) ? $params: array();
+ }
+
+ return new Request(
+ array(
+ 'get' => $_GET,
+ 'post' => $_POST,
+ 'files' => $_FILES,
+ 'server' => $_SERVER,
+ 'env' => $_ENV,
+ 'session' => $_SESSION,
+ 'cookies' => $_COOKIE,
+ 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+ ? $_SERVER['REQUEST_METHOD']
+ : null,
+ 'params' => $params,
+ 'urlParams' => $c['urlParams']
+ )
+ );
+ });
+ $this->registerService('PreviewManager', function($c){
+ return new PreviewManager();
+ });
+ $this->registerService('RootFolder', function($c){
+ // TODO: get user and user manager from container as well
+ $user = \OC_User::getUser();
+ $user = \OC_User::getManager()->get($user);
+ $manager = \OC\Files\Filesystem::getMountManager();
+ $view = new View();
+ return new Root($manager, $view, $user);
+ });
+ }
+
+ /**
+ * @return \OCP\Contacts\IManager
+ */
+ function getContactsManager() {
+ return $this->query('ContactsManager');
+ }
+
+ /**
+ * The current request object holding all information about the request currently being processed
+ * is returned from this method.
+ * In case the current execution was not initiated by a web request null is returned
+ *
+ * @return \OCP\IRequest|null
+ */
+ function getRequest()
+ {
+ return $this->query('Request');
+ }
+
+ /**
+ * Returns the preview manager which can create preview images for a given file
+ *
+ * @return \OCP\IPreview
+ */
+ function getPreviewManager()
+ {
+ return $this->query('PreviewManager');
+ }
+
+ /**
+ * Returns the root folder of ownCloud's data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getRootFolder()
+ {
+ return $this->query('RootFolder');
+ }
+}
diff --git a/lib/setup.php b/lib/setup.php
index 05a49890976f6d5d9b0d4855218081f6922aadc4..6bf3c88370f653d4067b59e833e8938e073d7b19 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -61,7 +61,7 @@ class OC_Setup {
}
//generate a random salt that is used to salt the local user passwords
- $salt = OC_Util::generate_random_bytes(30);
+ $salt = OC_Util::generateRandomBytes(30);
OC_Config::setValue('passwordsalt', $salt);
//write the config file
diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php
index 0cf04fde5a1ca17c68c6d04ec61e66a3f8c32b11..d97b6d2602fac048aa187ed9407d379b6786c612 100644
--- a/lib/setup/mysql.php
+++ b/lib/setup/mysql.php
@@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase {
$this->dbuser=substr('oc_'.$username, 0, 16);
if($this->dbuser!=$oldUser) {
//hash the password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
diff --git a/lib/setup/oci.php b/lib/setup/oci.php
index 86b53de45a49513d9021be521b145874f89db953..326d7a005317321940ee563894329d95ced0cdb3 100644
--- a/lib/setup/oci.php
+++ b/lib/setup/oci.php
@@ -65,7 +65,7 @@ class OCI extends AbstractDatabase {
//add prefix to the oracle user name to prevent collisions
$this->dbuser='oc_'.$username;
//create a new password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
//oracle passwords are treated as identifiers:
// must start with aphanumeric char
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php
index 49fcbf0326e5e23b655a5683b357acf86e5c7a50..89d328ada19cc0392f43069a6cfa1383e1852676 100644
--- a/lib/setup/postgresql.php
+++ b/lib/setup/postgresql.php
@@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase {
//add prefix to the postgresql user name to prevent collisions
$this->dbuser='oc_'.$username;
//create a new password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 0024c9d4960dc5383ca5f2657a25e5ba2964d459..625f3424a0473ce9dbde867bdb276683df6b9fb9 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template {
$user_displayname = OC_User::getDisplayName();
$this->assign( 'user_displayname', $user_displayname );
$this->assign( 'user_uid', OC_User::getUser() );
+ $this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
} else if ($renderas == 'guest' || $renderas == 'error') {
parent::__construct('core', 'layout.guest');
} else {
@@ -58,7 +59,7 @@ class OC_TemplateLayout extends OC_Template {
if (OC_Config::getValue('installed', false) && $renderas!='error') {
$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
}
- if (!empty(OC_Util::$core_scripts)) {
+ if (!empty(OC_Util::$coreScripts)) {
$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
}
foreach($jsfiles as $info) {
@@ -71,7 +72,7 @@ class OC_TemplateLayout extends OC_Template {
// Add the css files
$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
$this->assign('cssfiles', array());
- if (!empty(OC_Util::$core_styles)) {
+ if (!empty(OC_Util::$coreStyles)) {
$this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter);
}
foreach($cssfiles as $info) {
diff --git a/lib/user.php b/lib/user.php
index 93c7c9d4cd504120ddb2bfdcb094dd0cfb8f613a..0f6f40aec9ae414fc0318f2d33ef1fa2bcb3de9f 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -353,7 +353,7 @@ class OC_User {
* generates a password
*/
public static function generatePassword() {
- return OC_Util::generate_random_bytes(30);
+ return OC_Util::generateRandomBytes(30);
}
/**
diff --git a/lib/util.php b/lib/util.php
index 6195178701b57c92e8c8f867550ff614168533e4..41f5f1d16be3164c29e0a293a9ae8af2a67677d5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -11,12 +11,18 @@ class OC_Util {
public static $headers=array();
private static $rootMounted=false;
private static $fsSetup=false;
- public static $core_styles=array();
- public static $core_scripts=array();
+ public static $coreStyles=array();
+ public static $coreScripts=array();
- // Can be set up
- public static function setupFS( $user = '' ) {// configure the initial filesystem based on the configuration
- if(self::$fsSetup) {//setting up the filesystem twice can only lead to trouble
+ /**
+ * @brief Can be set up
+ * @param string $user
+ * @return boolean
+ * @description configure the initial filesystem based on the configuration
+ */
+ public static function setupFS( $user = '' ) {
+ //setting up the filesystem twice can only lead to trouble
+ if(self::$fsSetup) {
return false;
}
@@ -37,15 +43,16 @@ class OC_Util {
self::$fsSetup=true;
}
- $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+ $configDataDirectory = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//first set up the local "root" storage
\OC\Files\Filesystem::initMounts();
if(!self::$rootMounted) {
- \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
- self::$rootMounted=true;
+ \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$configDataDirectory), '/');
+ self::$rootMounted = true;
}
- if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem
+ //if we aren't logged in, there is no use to set up the filesystem
+ if( $user != "" ) {
$quota = self::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {
\OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) {
@@ -56,19 +63,19 @@ class OC_Util {
}
});
}
- $user_dir = '/'.$user.'/files';
- $user_root = OC_User::getHome($user);
- $userdirectory = $user_root . '/files';
- if( !is_dir( $userdirectory )) {
- mkdir( $userdirectory, 0755, true );
+ $userDir = '/'.$user.'/files';
+ $userRoot = OC_User::getHome($user);
+ $userDirectory = $userRoot . '/files';
+ if( !is_dir( $userDirectory )) {
+ mkdir( $userDirectory, 0755, true );
}
//jail the user into his "home" directory
- \OC\Files\Filesystem::init($user, $user_dir);
+ \OC\Files\Filesystem::init($user, $userDir);
$fileOperationProxy = new OC_FileProxy_FileOperations();
OC_FileProxy::register($fileOperationProxy);
- OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
+ OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
}
return true;
}
@@ -85,14 +92,17 @@ class OC_Util {
}
}
+ /**
+ * @return void
+ */
public static function tearDownFS() {
\OC\Files\Filesystem::tearDown();
self::$fsSetup=false;
- self::$rootMounted=false;
+ self::$rootMounted=false;
}
/**
- * get the current installed version of ownCloud
+ * @brief get the current installed version of ownCloud
* @return array
*/
public static function getVersion() {
@@ -102,7 +112,7 @@ class OC_Util {
}
/**
- * get the current installed version string of ownCloud
+ * @brief get the current installed version string of ownCloud
* @return string
*/
public static function getVersionString() {
@@ -110,7 +120,7 @@ class OC_Util {
}
/**
- * get the current installed edition of ownCloud. There is the community
+ * @description get the current installed edition of ownCloud. There is the community
* edition that just returns an empty string and the enterprise edition
* that returns "Enterprise".
* @return string
@@ -120,103 +130,117 @@ class OC_Util {
}
/**
- * add a javascript file
+ * @brief add a javascript file
*
- * @param appid $application
- * @param filename $file
+ * @param string $application
+ * @param filename $file
+ * @return void
*/
public static function addScript( $application, $file = null ) {
- if( is_null( $file )) {
+ if ( is_null( $file )) {
$file = $application;
$application = "";
}
- if( !empty( $application )) {
+ if ( !empty( $application )) {
self::$scripts[] = "$application/js/$file";
- }else{
+ } else {
self::$scripts[] = "js/$file";
}
}
/**
- * add a css file
+ * @brief add a css file
*
- * @param appid $application
- * @param filename $file
+ * @param string $application
+ * @param filename $file
+ * @return void
*/
public static function addStyle( $application, $file = null ) {
- if( is_null( $file )) {
+ if ( is_null( $file )) {
$file = $application;
$application = "";
}
- if( !empty( $application )) {
+ if ( !empty( $application )) {
self::$styles[] = "$application/css/$file";
- }else{
+ } else {
self::$styles[] = "css/$file";
}
}
/**
* @brief Add a custom element to the header
- * @param string tag tag name of the element
+ * @param string $tag tag name of the element
* @param array $attributes array of attributes for the element
* @param string $text the text content for the element
+ * @return void
*/
public static function addHeader( $tag, $attributes, $text='') {
- self::$headers[] = array('tag'=>$tag, 'attributes'=>$attributes, 'text'=>$text);
+ self::$headers[] = array(
+ 'tag'=>$tag,
+ 'attributes'=>$attributes,
+ 'text'=>$text
+ );
}
/**
- * formats a timestamp in the "right" way
+ * @brief formats a timestamp in the "right" way
*
- * @param int timestamp $timestamp
- * @param bool dateOnly option to omit time from the result
+ * @param int $timestamp
+ * @param bool $dateOnly option to omit time from the result
+ * @return string timestamp
+ * @description adjust to clients timezone if we know it
*/
public static function formatDate( $timestamp, $dateOnly=false) {
- if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it
+ if(\OC::$session->exists('timezone')) {
$systemTimeZone = intval(date('O'));
- $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100);
- $clientTimeZone=\OC::$session->get('timezone')*60;
- $offset=$clientTimeZone-$systemTimeZone;
- $timestamp=$timestamp+$offset*60;
+ $systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100);
+ $clientTimeZone = \OC::$session->get('timezone')*60;
+ $offset = $clientTimeZone - $systemTimeZone;
+ $timestamp = $timestamp + $offset*60;
}
- $l=OC_L10N::get('lib');
+ $l = OC_L10N::get('lib');
return $l->l($dateOnly ? 'date' : 'datetime', $timestamp);
}
/**
- * check if the current server configuration is suitable for ownCloud
+ * @brief check if the current server configuration is suitable for ownCloud
* @return array arrays with error messages and hints
*/
public static function checkServer() {
// Assume that if checkServer() succeeded before in this session, then all is fine.
- if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded'))
+ if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
return array();
+ }
- $errors=array();
+ $errors = array();
$defaults = new \OC_Defaults();
- $web_server_restart= false;
+ $webServerRestart = false;
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
and !is_callable('mysql_connect')
and !is_callable('pg_connect')
and !is_callable('oci_connect')) {
- $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
- 'hint'=>'');//TODO: sane hint
- $web_server_restart= true;
+ $errors[] = array(
+ 'error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
+ 'hint'=>'' //TODO: sane hint
+ );
+ $webServerRestart = true;
}
- //common hint for all file permissons error messages
+ //common hint for all file permissions error messages
$permissionsHint = 'Permissions can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
// Check if config folder is writable.
if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
$errors[] = array(
'error' => "Can't write into config directory",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
);
}
@@ -228,7 +252,8 @@ class OC_Util {
$errors[] = array(
'error' => "Can't write into apps directory",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
.'or disabling the appstore in the config file.'
);
}
@@ -243,94 +268,131 @@ class OC_Util {
$errors[] = array(
'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
);
}
} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
- $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
- 'hint'=>$permissionsHint);
+ $errors[] = array(
+ 'error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
+ 'hint'=>$permissionsHint
+ );
} else {
$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
}
+
+ $moduleHint = "Please ask your server administrator to install the module.";
// check if all required php modules are present
if(!class_exists('ZipArchive')) {
- $errors[]=array('error'=>'PHP module zip not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module zip not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!class_exists('DOMDocument')) {
- $errors[] = array('error' => 'PHP module dom not installed.',
- 'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $errors[] = array(
+ 'error' => 'PHP module dom not installed.',
+ 'hint' => $moduleHint
+ );
+ $webServerRestart =true;
}
if(!function_exists('xml_parser_create')) {
- $errors[] = array('error' => 'PHP module libxml not installed.',
- 'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $errors[] = array(
+ 'error' => 'PHP module libxml not installed.',
+ 'hint' => $moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('mb_detect_encoding')) {
- $errors[]=array('error'=>'PHP module mb multibyte not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module mb multibyte not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('ctype_digit')) {
- $errors[]=array('error'=>'PHP module ctype is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module ctype is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('json_encode')) {
- $errors[]=array('error'=>'PHP module JSON is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module JSON is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!extension_loaded('gd') || !function_exists('gd_info')) {
- $errors[]=array('error'=>'PHP module GD is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module GD is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('gzencode')) {
- $errors[]=array('error'=>'PHP module zlib is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module zlib is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('iconv')) {
- $errors[]=array('error'=>'PHP module iconv is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module iconv is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('simplexml_load_string')) {
- $errors[]=array('error'=>'PHP module SimpleXML is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module SimpleXML is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
- if(floatval(phpversion())<5.3) {
- $errors[]=array('error'=>'PHP 5.3 is required.',
+ if(floatval(phpversion()) < 5.3) {
+ $errors[] = array(
+ 'error'=>'PHP 5.3 is required.',
'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.'
- .' PHP 5.2 is no longer supported by ownCloud and the PHP community.');
- $web_server_restart=true;
+ .' PHP 5.2 is no longer supported by ownCloud and the PHP community.'
+ );
+ $webServerRestart = true;
}
if(!defined('PDO::ATTR_DRIVER_NAME')) {
- $errors[]=array('error'=>'PHP PDO module is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP PDO module is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if (((strtolower(@ini_get('safe_mode')) == 'on')
|| (strtolower(@ini_get('safe_mode')) == 'yes')
|| (strtolower(@ini_get('safe_mode')) == 'true')
|| (ini_get("safe_mode") == 1 ))) {
- $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
- 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
+ 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. '
+ .'Please ask your server administrator to disable it in php.ini or in your webserver config.'
+ );
+ $webServerRestart = true;
}
if (get_magic_quotes_gpc() == 1 ) {
- $errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
- 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
+ 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. '
+ .'Please ask your server administrator to disable it in php.ini or in your webserver config.'
+ );
+ $webServerRestart = true;
}
- if($web_server_restart) {
- $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?',
- 'hint'=>'Please ask your server administrator to restart the web server.');
+ if($webServerRestart) {
+ $errors[] = array(
+ 'error'=>'PHP modules have been installed, but they are still listed as missing?',
+ 'hint'=>'Please ask your server administrator to restart the web server.'
+ );
}
// Cache the result of this function
@@ -357,30 +419,36 @@ class OC_Util {
}
/**
- * Check for correct file permissions of data directory
- * @return array arrays with error messages and hints
- */
+ * @brief Check for correct file permissions of data directory
+ * @paran string $dataDirectory
+ * @return array arrays with error messages and hints
+ */
public static function checkDataDirectoryPermissions($dataDirectory) {
$errors = array();
- if (stristr(PHP_OS, 'WIN')) {
+ if (self::runningOnWindows()) {
//TODO: permissions checks for windows hosts
} else {
$permissionsModHint = 'Please change the permissions to 0770 so that the directory'
.' cannot be listed by other users.';
- $prems = substr(decoct(@fileperms($dataDirectory)), -3);
- if (substr($prems, -1) != '0') {
+ $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+ if (substr($perms, -1) != '0') {
OC_Helper::chmodr($dataDirectory, 0770);
clearstatcache();
- $prems = substr(decoct(@fileperms($dataDirectory)), -3);
- if (substr($prems, 2, 1) != '0') {
- $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users',
- 'hint' => $permissionsModHint);
+ $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+ if (substr($perms, 2, 1) != '0') {
+ $errors[] = array(
+ 'error' => 'Data directory ('.$dataDirectory.') is readable for other users',
+ 'hint' => $permissionsModHint
+ );
}
}
}
return $errors;
}
+ /**
+ * @return void
+ */
public static function displayLoginPage($errors = array()) {
$parameters = array();
foreach( $errors as $key => $value ) {
@@ -394,8 +462,8 @@ class OC_Util {
$parameters['user_autofocus'] = true;
}
if (isset($_REQUEST['redirect_url'])) {
- $redirect_url = $_REQUEST['redirect_url'];
- $parameters['redirect_url'] = urlencode($redirect_url);
+ $redirectUrl = $_REQUEST['redirect_url'];
+ $parameters['redirect_url'] = urlencode($redirectUrl);
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
@@ -404,7 +472,8 @@ class OC_Util {
/**
- * Check if the app is enabled, redirects to home if not
+ * @brief Check if the app is enabled, redirects to home if not
+ * @return void
*/
public static function checkAppEnabled($app) {
if( !OC_App::isEnabled($app)) {
@@ -416,18 +485,21 @@ class OC_Util {
/**
* Check if the user is logged in, redirects to home if not. With
* redirect URL parameter to the request URI.
+ * @return void
*/
public static function checkLoggedIn() {
// Check if we are a user
if( !OC_User::isLoggedIn()) {
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php',
- array('redirect_url' => OC_Request::requestUri())));
+ array('redirectUrl' => OC_Request::requestUri())
+ ));
exit();
}
}
/**
- * Check if the user is a admin, redirects to home if not
+ * @brief Check if the user is a admin, redirects to home if not
+ * @return void
*/
public static function checkAdminUser() {
if( !OC_User::isAdminUser(OC_User::getUser())) {
@@ -437,7 +509,7 @@ class OC_Util {
}
/**
- * Check if the user is a subadmin, redirects to home if not
+ * @brief Check if the user is a subadmin, redirects to home if not
* @return array $groups where the current user is subadmin
*/
public static function checkSubAdminUser() {
@@ -449,7 +521,8 @@ class OC_Util {
}
/**
- * Redirect to the user default page
+ * @brief Redirect to the user default page
+ * @return void
*/
public static function redirectToDefaultPage() {
if(isset($_REQUEST['redirect_url'])) {
@@ -457,13 +530,11 @@ class OC_Util {
}
else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
$location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' );
- }
- else {
- $defaultpage = OC_Appconfig::getValue('core', 'defaultpage');
- if ($defaultpage) {
- $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage);
- }
- else {
+ } else {
+ $defaultPage = OC_Appconfig::getValue('core', 'defaultpage');
+ if ($defaultPage) {
+ $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultPage);
+ } else {
$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
}
}
@@ -472,28 +543,28 @@ class OC_Util {
exit();
}
- /**
- * get an id unique for this instance
- * @return string
- */
- public static function getInstanceId() {
- $id = OC_Config::getValue('instanceid', null);
- if(is_null($id)) {
- // We need to guarantee at least one letter in instanceid so it can be used as the session_name
- $id = 'oc' . OC_Util::generate_random_bytes(10);
- OC_Config::setValue('instanceid', $id);
- }
- return $id;
- }
+ /**
+ * @brief get an id unique for this instance
+ * @return string
+ */
+ public static function getInstanceId() {
+ $id = OC_Config::getValue('instanceid', null);
+ if(is_null($id)) {
+ // We need to guarantee at least one letter in instanceid so it can be used as the session_name
+ $id = 'oc' . self::generateRandomBytes(10);
+ OC_Config::setValue('instanceid', $id);
+ }
+ return $id;
+ }
/**
* @brief Static lifespan (in seconds) when a request token expires.
* @see OC_Util::callRegister()
* @see OC_Util::isCallRegistered()
* @description
- * Also required for the client side to compute the piont in time when to
+ * Also required for the client side to compute the point in time when to
* request a fresh token. The client will do so when nearly 97% of the
- * timespan coded here has expired.
+ * time span coded here has expired.
*/
public static $callLifespan = 3600; // 3600 secs = 1 hour
@@ -513,7 +584,7 @@ class OC_Util {
// Check if a token exists
if(!\OC::$session->exists('requesttoken')) {
// No valid token found, generate a new one.
- $requestToken = self::generate_random_bytes(20);
+ $requestToken = self::generateRandomBytes(20);
\OC::$session->set('requesttoken', $requestToken);
} else {
// Valid token already exists, send it
@@ -534,11 +605,11 @@ class OC_Util {
}
if(isset($_GET['requesttoken'])) {
- $token=$_GET['requesttoken'];
+ $token = $_GET['requesttoken'];
} elseif(isset($_POST['requesttoken'])) {
- $token=$_POST['requesttoken'];
+ $token = $_POST['requesttoken'];
} elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) {
- $token=$_SERVER['HTTP_REQUESTTOKEN'];
+ $token = $_SERVER['HTTP_REQUESTTOKEN'];
} else {
//no token found.
return false;
@@ -556,11 +627,12 @@ class OC_Util {
/**
* @brief Check an ajax get/post call if the request token is valid. exit if not.
- * Todo: Write howto
+ * @todo Write howto
+ * @return void
*/
public static function callCheck() {
if(!OC_Util::isCallRegistered()) {
- exit;
+ exit();
}
}
@@ -570,14 +642,15 @@ class OC_Util {
* This function is used to sanitize HTML and should be applied on any
* string or array of strings before displaying it on a web page.
*
- * @param string or array of strings
+ * @param string|array of strings
* @return array with sanitized strings or a single sanitized string, depends on the input parameter.
*/
public static function sanitizeHTML( &$value ) {
if (is_array($value)) {
array_walk_recursive($value, 'OC_Util::sanitizeHTML');
} else {
- $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+ //Specify encoding for PHP<5.4
+ $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8');
}
return $value;
}
@@ -599,48 +672,52 @@ class OC_Util {
}
/**
- * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
+ * @brief Check if the htaccess file is working
+ * @return bool
+ * @description Check if the htaccess file is working by creating a test
+ * file in the data directory and trying to access via http
*/
- public static function ishtaccessworking() {
+ public static function isHtAccessWorking() {
// testdata
- $filename='/htaccesstest.txt';
- $testcontent='testcontent';
+ $fileName = '/htaccesstest.txt';
+ $testContent = 'testcontent';
// creating a test file
- $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
+ $testFile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$fileName;
- if(file_exists($testfile)) {// already running this test, possible recursive call
+ if(file_exists($testFile)) {// already running this test, possible recursive call
return false;
}
- $fp = @fopen($testfile, 'w');
- @fwrite($fp, $testcontent);
+ $fp = @fopen($testFile, 'w');
+ @fwrite($fp, $testContent);
@fclose($fp);
// accessing the file via http
- $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename);
+ $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$fileName);
$fp = @fopen($url, 'r');
$content=@fread($fp, 2048);
@fclose($fp);
// cleanup
- @unlink($testfile);
+ @unlink($testFile);
// does it work ?
- if($content==$testcontent) {
- return(false);
- }else{
- return(true);
+ if($content==$testContent) {
+ return false;
+ } else {
+ return true;
}
}
/**
- * we test if webDAV is working properly
- *
+ * @brief test if webDAV is working properly
+ * @return bool
+ * @description
* The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND
* the web server it self is setup properly.
*
- * Why not an authenticated PROFIND and other verbs?
+ * Why not an authenticated PROPFIND and other verbs?
* - We don't have the password available
* - We have no idea about other auth methods implemented (e.g. OAuth with Bearer header)
*
@@ -654,7 +731,7 @@ class OC_Util {
);
// save the old timeout so that we can restore it later
- $old_timeout=ini_get("default_socket_timeout");
+ $oldTimeout = ini_get("default_socket_timeout");
// use a 5 sec timeout for the check. Should be enough for local requests.
ini_set("default_socket_timeout", 5);
@@ -668,24 +745,25 @@ class OC_Util {
try {
// test PROPFIND
$client->propfind('', array('{DAV:}resourcetype'));
- } catch(\Sabre_DAV_Exception_NotAuthenticated $e) {
+ } catch (\Sabre_DAV_Exception_NotAuthenticated $e) {
$return = true;
- } catch(\Exception $e) {
+ } catch (\Exception $e) {
OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e->getMessage(). ' ('.get_class($e).')', OC_Log::WARN);
$return = false;
}
// restore the original timeout
- ini_set("default_socket_timeout", $old_timeout);
+ ini_set("default_socket_timeout", $oldTimeout);
return $return;
}
/**
- * Check if the setlocal call doesn't work. This can happen if the right
+ * Check if the setlocal call does not work. This can happen if the right
* local packages are not available on the server.
+ * @return bool
*/
- public static function issetlocaleworking() {
+ public static function isSetLocaleWorking() {
// setlocale test is pointless on Windows
if (OC_Util::runningOnWindows() ) {
return true;
@@ -699,7 +777,7 @@ class OC_Util {
}
/**
- * Check if the PHP module fileinfo is loaded.
+ * @brief Check if the PHP module fileinfo is loaded.
* @return bool
*/
public static function fileInfoLoaded() {
@@ -707,7 +785,8 @@ class OC_Util {
}
/**
- * Check if the ownCloud server can connect to the internet
+ * @brief Check if the ownCloud server can connect to the internet
+ * @return bool
*/
public static function isInternetConnectionWorking() {
// in case there is no internet connection on purpose return false
@@ -720,30 +799,29 @@ class OC_Util {
if ($connected) {
fclose($connected);
return true;
- }else{
-
+ } else {
// second try in case one server is down
$connected = @fsockopen("apps.owncloud.com", 80);
if ($connected) {
fclose($connected);
return true;
- }else{
+ } else {
return false;
}
-
}
-
}
/**
- * Check if the connection to the internet is disabled on purpose
+ * @brief Check if the connection to the internet is disabled on purpose
+ * @return bool
*/
public static function isInternetConnectionEnabled(){
return \OC_Config::getValue("has_internet_connection", true);
}
/**
- * clear all levels of output buffering
+ * @brief clear all levels of output buffering
+ * @return void
*/
public static function obEnd(){
while (ob_get_level()) {
@@ -753,47 +831,47 @@ class OC_Util {
/**
- * @brief Generates a cryptographical secure pseudorandom string
- * @param Int with the length of the random string
+ * @brief Generates a cryptographic secure pseudo-random string
+ * @param Int $length of the random string
* @return String
- * Please also update secureRNG_available if you change something here
+ * Please also update secureRNGAvailable if you change something here
*/
- public static function generate_random_bytes($length = 30) {
-
+ public static function generateRandomBytes($length = 30) {
// Try to use openssl_random_pseudo_bytes
- if(function_exists('openssl_random_pseudo_bytes')) {
- $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong));
+ if (function_exists('openssl_random_pseudo_bytes')) {
+ $pseudoByte = bin2hex(openssl_random_pseudo_bytes($length, $strong));
if($strong == true) {
- return substr($pseudo_byte, 0, $length); // Truncate it to match the length
+ return substr($pseudoByte, 0, $length); // Truncate it to match the length
}
}
// Try to use /dev/urandom
- $fp = @file_get_contents('/dev/urandom', false, null, 0, $length);
- if ($fp !== false) {
- $string = substr(bin2hex($fp), 0, $length);
- return $string;
+ if (!self::runningOnWindows()) {
+ $fp = @file_get_contents('/dev/urandom', false, null, 0, $length);
+ if ($fp !== false) {
+ $string = substr(bin2hex($fp), 0, $length);
+ return $string;
+ }
}
// Fallback to mt_rand()
$characters = '0123456789';
$characters .= 'abcdefghijklmnopqrstuvwxyz';
$charactersLength = strlen($characters)-1;
- $pseudo_byte = "";
+ $pseudoByte = "";
// Select some random characters
for ($i = 0; $i < $length; $i++) {
- $pseudo_byte .= $characters[mt_rand(0, $charactersLength)];
+ $pseudoByte .= $characters[mt_rand(0, $charactersLength)];
}
- return $pseudo_byte;
+ return $pseudoByte;
}
/**
* @brief Checks if a secure random number generator is available
* @return bool
*/
- public static function secureRNG_available() {
-
+ public static function secureRNGAvailable() {
// Check openssl_random_pseudo_bytes
if(function_exists('openssl_random_pseudo_bytes')) {
openssl_random_pseudo_bytes(1, $strong);
@@ -803,9 +881,11 @@ class OC_Util {
}
// Check /dev/urandom
- $fp = @file_get_contents('/dev/urandom', false, null, 0, 1);
- if ($fp !== false) {
- return true;
+ if (!self::runningOnWindows()) {
+ $fp = @file_get_contents('/dev/urandom', false, null, 0, 1);
+ if ($fp !== false) {
+ return true;
+ }
}
return false;
@@ -818,11 +898,8 @@ class OC_Util {
* This function get the content of a page via curl, if curl is enabled.
* If not, file_get_element is used.
*/
-
public static function getUrlContent($url){
-
- if (function_exists('curl_init')) {
-
+ if (function_exists('curl_init')) {
$curl = curl_init();
curl_setopt($curl, CURLOPT_HEADER, 0);
@@ -833,10 +910,10 @@ class OC_Util {
curl_setopt($curl, CURLOPT_MAXREDIRS, 10);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
- if(OC_Config::getValue('proxy', '')<>'') {
+ if(OC_Config::getValue('proxy', '') != '') {
curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
}
- if(OC_Config::getValue('proxyuserpwd', '')<>'') {
+ if(OC_Config::getValue('proxyuserpwd', '') != '') {
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
}
$data = curl_exec($curl);
@@ -845,7 +922,7 @@ class OC_Util {
} else {
$contextArray = null;
- if(OC_Config::getValue('proxy', '')<>'') {
+ if(OC_Config::getValue('proxy', '') != '') {
$contextArray = array(
'http' => array(
'timeout' => 10,
@@ -860,11 +937,10 @@ class OC_Util {
);
}
-
$ctx = stream_context_create(
$contextArray
);
- $data=@file_get_contents($url, 0, $ctx);
+ $data = @file_get_contents($url, 0, $ctx);
}
return $data;
@@ -877,7 +953,6 @@ class OC_Util {
return (substr(PHP_OS, 0, 3) === "WIN");
}
-
/**
* Handles the case that there may not be a theme, then check if a "default"
* theme exists and take that one
@@ -887,20 +962,19 @@ class OC_Util {
$theme = OC_Config::getValue("theme", '');
if($theme === '') {
-
if(is_dir(OC::$SERVERROOT . '/themes/default')) {
$theme = 'default';
}
-
}
return $theme;
}
/**
- * Clear the opcode cache if one exists
+ * @brief Clear the opcode cache if one exists
* This is necessary for writing to the config file
- * in case the opcode cache doesn't revalidate files
+ * in case the opcode cache does not re-validate files
+ * @return void
*/
public static function clearOpcodeCache() {
// APC
@@ -939,8 +1013,10 @@ class OC_Util {
return $value;
}
- public static function basename($file)
- {
+ /**
+ * @return string
+ */
+ public static function basename($file) {
$file = rtrim($file, '/');
$t = explode('/', $file);
return array_pop($t);
diff --git a/settings/admin.php b/settings/admin.php
index 869729a9e4102a532e06baffc0fe0320ffc6bcdb..dd36790907df7621733938c032479ce648cba290 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" );
$tmpl = new OC_Template( 'settings', 'admin', 'user');
$forms=OC_App::getForms('admin');
-$htaccessworking=OC_Util::ishtaccessworking();
+$htaccessworking=OC_Util::isHtAccessWorking();
$entries=OC_Log_Owncloud::getEntries(3);
$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
@@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
-$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index d5ffe44848266db87d8333ee8a894b857319119d..57a43180a43a5e9b5f2e2d54ecb6add952ab24bf 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -21,6 +21,10 @@ input#openid, input#webdav { width:20em; }
input#identity { width:20em; }
#email { width: 17em; }
+#avatar .warning {
+ width: 350px;
+}
+
.msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
.msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8ad26c086b51839879a2830f8b478a9177286c4e..fab32b83b64cb7bd375b02a002e3e1b373db073d 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -44,6 +44,78 @@ function changeDisplayName(){
}
}
+function updateAvatar () {
+ $headerdiv = $('#header .avatardiv');
+ $displaydiv = $('#displayavatar .avatardiv');
+
+ $headerdiv.css({'background-color': ''});
+ $headerdiv.avatar(OC.currentUser, 32, true);
+ $displaydiv.css({'background-color': ''});
+ $displaydiv.avatar(OC.currentUser, 128, true);
+}
+
+function showAvatarCropper() {
+ $cropper = $('#cropper');
+ $cropper.prepend("<img>");
+ $cropperImage = $('#cropper img');
+
+ $cropperImage.attr('src', OC.Router.generate('core_avatar_get_tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
+
+ // Looks weird, but on('load', ...) doesn't work in IE8
+ $cropperImage.ready(function(){
+ $('#displayavatar').hide();
+ $cropper.show();
+
+ $cropperImage.Jcrop({
+ onChange: saveCoords,
+ onSelect: saveCoords,
+ aspectRatio: 1,
+ boxHeight: 500,
+ boxWidth: 500,
+ setSelect: [0, 0, 300, 300]
+ });
+ });
+}
+
+function sendCropData() {
+ cleanCropper();
+
+ var cropperdata = $('#cropper').data();
+ var data = {
+ x: cropperdata.x,
+ y: cropperdata.y,
+ w: cropperdata.w,
+ h: cropperdata.h
+ };
+ $.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler);
+}
+
+function saveCoords(c) {
+ $('#cropper').data(c);
+}
+
+function cleanCropper() {
+ $cropper = $('#cropper');
+ $('#displayavatar').show();
+ $cropper.hide();
+ $('.jcrop-holder').remove();
+ $('#cropper img').removeData('Jcrop').removeAttr('style').removeAttr('src');
+ $('#cropper img').remove();
+}
+
+function avatarResponseHandler(data) {
+ $warning = $('#avatar .warning');
+ $warning.hide();
+ if (data.status === "success") {
+ updateAvatar();
+ } else if (data.data === "notsquare") {
+ showAvatarCropper();
+ } else {
+ $warning.show();
+ $warning.text(data.data.message);
+ }
+}
+
$(document).ready(function(){
$("#passwordbutton").click( function(){
if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
@@ -94,7 +166,7 @@ $(document).ready(function(){
$("#languageinput").chosen();
// Show only the not selectable optgroup
// Choosen only shows optgroup-labels if there are options in the optgroup
- $(".languagedivider").remove();
+ $(".languagedivider").hide();
$("#languageinput").change( function(){
// Serialize the data
@@ -128,6 +200,46 @@ $(document).ready(function(){
}
});
+ var uploadparms = {
+ done: function(e, data) {
+ avatarResponseHandler(data.result);
+ }
+ };
+
+ $('#uploadavatarbutton').click(function(){
+ $('#uploadavatar').click();
+ });
+
+ $('#uploadavatar').fileupload(uploadparms);
+
+ $('#selectavatar').click(function(){
+ OC.dialogs.filepicker(
+ t('settings', "Select a profile picture"),
+ function(path){
+ $.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
+ },
+ false,
+ ["image/png", "image/jpeg"]
+ );
+ });
+
+ $('#removeavatar').click(function(){
+ $.ajax({
+ type: 'DELETE',
+ url: OC.Router.generate('core_avatar_delete'),
+ success: function(msg) {
+ updateAvatar();
+ }
+ });
+ });
+
+ $('#abortcropperbutton').click(function(){
+ cleanCropper();
+ });
+
+ $('#sendcropperbutton').click(function(){
+ sendCropData();
+ });
} );
OC.Encryption = {
diff --git a/settings/js/users.js b/settings/js/users.js
index ab08d7099c6160d49ec61bca85bf833ce69519d7..01a845367e252192f04be52f95670d9e4848d7fd 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -91,13 +91,13 @@ var UserList = {
tr.find('td.displayName > span').text(displayname);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
.attr('data-username', username)
- .attr('data-user-groups', [groups]);
+ .data('user-groups', groups);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
.attr('data-username', username)
- .attr('data-user-groups', [groups])
- .attr('data-subadmin', [subadmin]);
+ .data('user-groups', groups)
+ .data('subadmin', subadmin);
tr.find('td.subadmins').empty();
}
$.each(this.availableGroups, function (i, group) {
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 4f3099b8c24c376c7fc48f60510daa9cc108d851..52610e1c4fe504bf4ea27c5fbcc84fa345170c86 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error de autenticación",
-"Your display name has been changed." => "Su nombre fue cambiado.",
+"Your display name has been changed." => "Su nombre de usuario ha sido cambiado.",
"Unable to change display name" => "No se pudo cambiar el nombre de usuario",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No se pudo añadir el grupo",
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Espere, por favor....",
+"Error while disabling app" => "Error mientras se desactivaba la aplicación",
+"Error while enabling app" => "Error mientras se activaba la aplicación",
"Updating...." => "Actualizando....",
"Error while updating app" => "Error mientras se actualizaba la aplicación",
"Error" => "Error",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
"Saving..." => "Guardando...",
"deleted" => "Eliminado",
"undo" => "deshacer",
@@ -38,12 +41,12 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Se debe proporcionar una contraseña valida",
"__language_name__" => "Castellano",
"Security Warning" => "Advertencia de seguridad",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
"Setup Warning" => "Advertencia de configuración",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-"Module 'fileinfo' missing" => "Módulo 'fileinfo' perdido",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
+"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
"Locale not working" => "La configuración regional no está funcionando",
"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La configuración regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.",
"Internet connection not working" => "La conexion a internet no esta funcionando",
@@ -56,7 +59,7 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow public uploads" => "Permitir subidas públicas",
"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
"Allow resharing" => "Permitir re-compartición",
@@ -76,8 +79,8 @@ $TRANSLATIONS = array(
"Add your App" => "Añade tu aplicación",
"More Apps" => "Más aplicaciones",
"Select an App" => "Seleccionar una aplicación",
-"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
"User Documentation" => "Documentación de usuario",
"Administrator Documentation" => "Documentación de adminstrador",
"Online Documentation" => "Documentación en linea",
@@ -85,7 +88,7 @@ $TRANSLATIONS = array(
"Bugtracker" => "Rastreador de fallos",
"Commercial Support" => "Soporte comercial",
"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
+"Show First Run Wizard again" => "Mostrar asistente para iniciar de nuevo",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
"Password" => "Contraseña",
"Your password was changed" => "Su contraseña ha sido cambiada",
@@ -98,10 +101,13 @@ $TRANSLATIONS = array(
"Your email address" => "Su dirección de correo",
"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
"Language" => "Idioma",
-"Help translate" => "Ayúdnos a traducir",
+"Help translate" => "Ayúdanos a traducir",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
"Encryption" => "Cifrado",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de cifrado no está activada, descifre sus archivos",
+"Log-in password" => "Contraseña de acceso",
+"Decrypt all Files" => "Descifrar archivos",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f4f50e5949afd889c2f2d787080f92ddefa7c96d..252692ea4c34e211837d0cebf60ff712fe25c8fa 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Por favor, esperá....",
+"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
+"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
"Updating...." => "Actualizando....",
"Error while updating app" => "Error al actualizar App",
"Error" => "Error",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
"Saving..." => "Guardando...",
"deleted" => "borrado",
"undo" => "deshacer",
@@ -38,14 +41,20 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Debe ingresar una contraseña válida",
"__language_name__" => "Castellano (Argentina)",
"Security Warning" => "Advertencia de seguridad",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
"Setup Warning" => "Alerta de Configuración",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
"Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
"Locale not working" => "\"Locale\" no está funcionando",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s.",
"Internet connection not working" => "La conexión a Internet no esta funcionando. ",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http.",
+"Use systems cron service to call the cron.php file once a minute." => "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto.",
"Sharing" => "Compartiendo",
"Enable Share API" => "Habilitar Share API",
"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +68,8 @@ $TRANSLATIONS = array(
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
"Security" => "Seguridad",
"Enforce HTTPS" => "Forzar HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
"Log" => "Log",
"Log level" => "Nivel de Log",
"More" => "Más",
@@ -94,6 +105,9 @@ $TRANSLATIONS = array(
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
"Encryption" => "Encriptación",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos",
+"Log-in password" => "Clave de acceso",
+"Decrypt all Files" => "Desencriptar todos los archivos",
"Login Name" => "Nombre de Usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4549dcea52c0bd895814c974fa5c770f8455e655..d0a8abea7133b59f93167758456743caf829c8e5 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Invalid request" => "داواکارى نادروستە",
"Enable" => "چالاککردن",
"Error" => "ههڵه",
"Update" => "نوێکردنهوه",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index da0fb8f56b5402e8d65e21ccf261ffe49a4bac43..31c9e2be59fe0b8f467d6efc62d6bf395a7c97d8 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
"Authentication error" => "Autentikacijos klaida",
+"Your display name has been changed." => "Jūsų rodomas vardas buvo pakeistas.",
+"Unable to change display name" => "Nepavyksta pakeisti rodomą vardą",
"Group already exists" => "Grupė jau egzistuoja",
"Unable to add group" => "Nepavyko pridėti grupės",
"Email saved" => "El. paštas išsaugotas",
@@ -10,6 +12,7 @@ $TRANSLATIONS = array(
"Unable to delete user" => "Nepavyko ištrinti vartotojo",
"Language changed" => "Kalba pakeista",
"Invalid request" => "Klaidinga užklausa",
+"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės",
"Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
"Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
"Couldn't update app." => "Nepavyko atnaujinti programos.",
@@ -17,16 +20,20 @@ $TRANSLATIONS = array(
"Disable" => "Išjungti",
"Enable" => "Įjungti",
"Please wait...." => "Prašome palaukti...",
+"Error while disabling app" => "Klaida išjungiant programą",
+"Error while enabling app" => "Klaida įjungiant programą",
"Updating...." => "Atnaujinama...",
"Error while updating app" => "Įvyko klaida atnaujinant programą",
"Error" => "Klaida",
"Update" => "Atnaujinti",
"Updated" => "Atnaujinta",
+"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
"Saving..." => "Saugoma...",
"deleted" => "ištrinta",
"undo" => "anuliuoti",
"Unable to remove user" => "Nepavyko ištrinti vartotojo",
"Groups" => "Grupės",
+"Group Admin" => "Grupės administratorius",
"Delete" => "Ištrinti",
"add group" => "pridėti grupę",
"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
@@ -34,42 +41,83 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Slaptažodis turi būti tinkamas",
"__language_name__" => "Kalba",
"Security Warning" => "Saugumo pranešimas",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
+"Setup Warning" => "Nustatyti perspėjimą",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>.",
"Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+"Locale not working" => "Lokalė neveikia",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s.",
+"Internet connection not working" => "Nėra interneto ryšio",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
"Cron" => "Cron",
+"Execute one task with each page loaded" => "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http.",
+"Use systems cron service to call the cron.php file once a minute." => "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę.",
"Sharing" => "Dalijimasis",
+"Enable Share API" => "Įjungti Share API",
+"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
"Allow links" => "Lesti nuorodas",
+"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
+"Allow public uploads" => "Leisti viešus įkėlimus",
+"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus",
"Allow resharing" => "Leisti dalintis",
+"Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
+"Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
+"Allow users to only share with users in their groups" => "Leisti naudotojams dalintis tik su naudotojais savo grupėje",
"Security" => "Saugumas",
+"Enforce HTTPS" => "Reikalauti HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
"Log" => "Žurnalas",
"Log level" => "Žurnalo išsamumas",
"More" => "Daugiau",
"Less" => "Mažiau",
"Version" => "Versija",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Pridėti programėlę",
"More Apps" => "Daugiau aplikacijų",
"Select an App" => "Pasirinkite programą",
+"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"User Documentation" => "Naudotojo dokumentacija",
+"Administrator Documentation" => "Administratoriaus dokumentacija",
+"Online Documentation" => "Dokumentacija tinkle",
"Forum" => "Forumas",
"Bugtracker" => "Klaidų sekimas",
+"Commercial Support" => "Komercinis palaikymas",
"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
"Password" => "Slaptažodis",
"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
"Current password" => "Dabartinis slaptažodis",
"New password" => "Naujas slaptažodis",
"Change password" => "Pakeisti slaptažodį",
+"Display Name" => "Rodyti vardą",
"Email" => "El. Paštas",
"Your email address" => "Jūsų el. pašto adresas",
"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pasiekti savo failus per WebDAV</a>",
"Encryption" => "Šifravimas",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus",
+"Log-in password" => "Prisijungimo slaptažodis",
+"Decrypt all Files" => "Iššifruoti visus failus",
"Login Name" => "Vartotojo vardas",
"Create" => "Sukurti",
+"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
+"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+"Default Storage" => "Numatytas saugojimas",
"Unlimited" => "Neribota",
"Other" => "Kita",
"Username" => "Prisijungimo vardas",
+"Storage" => "Saugojimas",
+"change display name" => "keisti rodomą vardą",
"set new password" => "nustatyti naują slaptažodį",
"Default" => "Numatytasis"
);
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 438e21d5bcf49f99570373e7ed0d303025df80b2..822a17e783133545e4d564acd8f67381c5ba6eeb 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Slå av",
"Enable" => "Slå på",
"Please wait...." => "Ver venleg og vent …",
+"Error while disabling app" => "Klarte ikkje å skru av programmet",
+"Error while enabling app" => "Klarte ikkje å skru på programmet",
"Updating...." => "Oppdaterer …",
"Error while updating app" => "Feil ved oppdatering av app",
"Error" => "Feil",
"Update" => "Oppdater",
"Updated" => "Oppdatert",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
"Saving..." => "Lagrar …",
"deleted" => "sletta",
"undo" => "angra",
@@ -38,25 +41,35 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Du må oppgje eit gyldig passord",
"__language_name__" => "Nynorsk",
"Security Warning" => "Tryggleiksåtvaring",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
"Setup Warning" => "Oppsettsåtvaring",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>.",
"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
"Locale not working" => "Regionaldata fungerer ikkje",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s.",
"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet.",
"Sharing" => "Deling",
"Enable Share API" => "Slå på API-et for deling",
"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
"Allow links" => "Tillat lenkjer",
"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
+"Allow public uploads" => "Tillat offentlege opplastingar",
+"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
"Allow resharing" => "Tillat vidaredeling",
"Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
"Allow users to share with anyone" => "La brukarar dela med kven som helst",
"Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
"Security" => "Tryggleik",
"Enforce HTTPS" => "Krev HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
"Log" => "Logg",
"Log level" => "Log nivå",
"More" => "Meir",
@@ -90,8 +103,15 @@ $TRANSLATIONS = array(
"Language" => "Språk",
"Help translate" => "Hjelp oss å omsetja",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filene",
"Login Name" => "Innloggingsnamn",
"Create" => "Lag",
+"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
+"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
"Default Storage" => "Standardlagring",
"Unlimited" => "Ubegrensa",
"Other" => "Anna",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 1d8619de7e730982360ff05d72b9e098b7cde37b..a8bc60ffed613c63ab30766dee9b1e0c07fc8ac2 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Wyłącz",
"Enable" => "Włącz",
"Please wait...." => "Proszę czekać...",
+"Error while disabling app" => "Błąd podczas wyłączania aplikacji",
+"Error while enabling app" => "Błąd podczas włączania aplikacji",
"Updating...." => "Aktualizacja w toku...",
"Error while updating app" => "Błąd podczas aktualizacji aplikacji",
"Error" => "Błąd",
"Update" => "Aktualizuj",
"Updated" => "Zaktualizowano",
+"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
"Saving..." => "Zapisywanie...",
"deleted" => "usunięto",
"undo" => "cofnij",
@@ -38,21 +41,27 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Należy podać prawidłowe hasło",
"__language_name__" => "polski",
"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
"Setup Warning" => "Ostrzeżenia konfiguracji",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>.",
"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"Locale not working" => "Lokalizacja nie działa",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.",
"Internet connection not working" => "Połączenie internetowe nie działa",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http.",
+"Use systems cron service to call the cron.php file once a minute." => "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę.",
"Sharing" => "Udostępnianie",
"Enable Share API" => "Włącz API udostępniania",
"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
"Allow links" => "Zezwalaj na odnośniki",
"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
"Allow public uploads" => "Pozwól na publiczne wczytywanie",
+"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów",
"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
@@ -60,6 +69,7 @@ $TRANSLATIONS = array(
"Security" => "Bezpieczeństwo",
"Enforce HTTPS" => "Wymuś HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
"Log" => "Logi",
"Log level" => "Poziom logów",
"More" => "Więcej",
@@ -93,7 +103,11 @@ $TRANSLATIONS = array(
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
"Encryption" => "Szyfrowanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
+"Log-in password" => "Hasło logowania",
+"Decrypt all Files" => "Odszyfruj wszystkie pliki",
"Login Name" => "Login",
"Create" => "Utwórz",
"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index facffb9ba18280bd6131585ee8bd303a6f849c61..d4726a29bb6e22c77a3ad459597ef4011e2f6f03 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
+"Invalid request" => "Kërkesë e pavlefshme",
"Error" => "Veprim i gabuar",
"Update" => "Azhurno",
"undo" => "anulo",
@@ -11,6 +12,7 @@ $TRANSLATIONS = array(
"Password" => "Kodi",
"New password" => "Kodi i ri",
"Email" => "Email-i",
+"Other" => "Të tjera",
"Username" => "Përdoruesi"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/personal.php b/settings/personal.php
index 112eaa3c748425e2538f60ef9f87e3c08614960b..670e18e20ef56497951ac5dc7489146b8423b322 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,6 +15,11 @@ OC_Util::addScript( 'settings', 'personal' );
OC_Util::addStyle( 'settings', 'settings' );
OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
OC_Util::addStyle( '3rdparty', 'chosen' );
+\OC_Util::addScript('files', 'jquery.fileupload');
+if (\OC_Config::getValue('enable_avatars', true) === true) {
+ \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
+ \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
+}
OC_App::setActiveNavigationEntry( 'personal' );
$storageInfo=OC_Helper::getStorageInfo('/');
@@ -84,6 +89,7 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 63e1258b958e692cabbd83b0820afe8e8f9f78f1..d2ca8154f160bdf20754e773c7c29588030c75c0 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -80,6 +80,27 @@ if($_['passwordChangeSupported']) {
}
?>
+<?php if ($_['enableAvatars']): ?>
+<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
+ <fieldset class="personalblock">
+ <legend><strong><?php p($l->t('Profile picture')); ?></strong></legend>
+ <div id="displayavatar">
+ <div class="avatardiv"></div><br>
+ <div class="warning hidden"></div>
+ <div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+ <input type="file" class="hidden" name="files[]" id="uploadavatar">
+ <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
+ <div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+ <?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
+ </div>
+ <div id="cropper" class="hidden">
+ <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Abort')); ?></div>
+ <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+ </div>
+ </fieldset>
+</form>
+<?php endif; ?>
+
<form>
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Language'));?></strong></legend>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 22450fdf25f4332a81e3ae82cf9ac6e4026b6c65..747d052a7bd959c7f99b534261f2db2e1f6a9627 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -81,6 +81,9 @@ $_['subadmingroups'] = array_flip($items);
<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
<thead>
<tr>
+ <?php if ($_['enableAvatars']): ?>
+ <th id='headerAvatar'></th>
+ <?php endif; ?>
<th id='headerName'><?php p($l->t('Username'))?></th>
<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
@@ -96,6 +99,9 @@ $_['subadmingroups'] = array_flip($items);
<?php foreach($_["users"] as $user): ?>
<tr data-uid="<?php p($user["name"]) ?>"
data-displayName="<?php p($user["displayName"]) ?>">
+ <?php if ($_['enableAvatars']): ?>
+ <td class="avatar"><div class="avatardiv"></div></td>
+ <?php endif; ?>
<td class="name"><?php p($user["name"]); ?></td>
<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
src="<?php p(image_path('core', 'actions/rename.svg'))?>"
diff --git a/settings/users.php b/settings/users.php
index 213d1eecfda01ef0d921531705dc923619fbcbbf..2f1c63a0b59856900109f277c0ff93e5aa3366bd 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -81,4 +81,5 @@ $tmpl->assign( 'quota_preset', $quotaPreset);
$tmpl->assign( 'default_quota', $defaultQuota);
$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$tmpl->printPage();
diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml
index 8f6dc5e2ecd539b9571ec8a66da28563c97208e7..2e83bbb78c7577d3aef0c5b6039f12598ef36073 100644
--- a/tests/data/db_structure.xml
+++ b/tests/data/db_structure.xml
@@ -178,4 +178,25 @@
</declaration>
</table>
+ <table>
+ <name>*dbprefix*timestamp</name>
+ <declaration>
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>timestamptest</name>
+ <type>timestamp</type>
+ <default></default>
+ <notnull>false</notnull>
+ </field>
+ </declaration>
+ </table>
+
</database>
diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml
index 6f12f81f477d94cb7a118288d9a41c0285f0ccdc..bbfb24985cb1c67c4628f4b10448b0df35bc56d9 100644
--- a/tests/data/db_structure2.xml
+++ b/tests/data/db_structure2.xml
@@ -75,4 +75,25 @@
</table>
+ <table>
+ <name>*dbprefix*timestamp</name>
+ <declaration>
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>timestamptest</name>
+ <type>timestamp</type>
+ <default></default>
+ <notnull>false</notnull>
+ </field>
+ </declaration>
+ </table>
+
</database>
diff --git a/tests/data/testavatar.png b/tests/data/testavatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..24770fb634f028fbff8c0625e987ead5bb0471c9
Binary files /dev/null and b/tests/data/testavatar.png differ
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..80abaefc43b0a4e285a982facc079b61d6a1e6d5
--- /dev/null
+++ b/tests/lib/appframework/AppTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+
+class AppTest extends \PHPUnit_Framework_TestCase {
+
+ private $container;
+ private $api;
+ private $controller;
+ private $dispatcher;
+ private $params;
+ private $headers;
+ private $output;
+ private $controllerName;
+ private $controllerMethod;
+
+ protected function setUp() {
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test');
+ $this->controller = $this->getMockBuilder(
+ 'OC\AppFramework\Controller\Controller')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->dispatcher = $this->getMockBuilder(
+ 'OC\AppFramework\Http\Dispatcher')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+
+ $this->headers = array('key' => 'value');
+ $this->output = 'hi';
+ $this->controllerName = 'Controller';
+ $this->controllerMethod = 'method';
+
+ $this->container[$this->controllerName] = $this->controller;
+ $this->container['Dispatcher'] = $this->dispatcher;
+ }
+
+
+ public function testControllerNameAndMethodAreBeingPassed(){
+ $return = array(null, array(), null);
+ $this->dispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->returnValue($return));
+
+ $this->expectOutputString('');
+
+ App::main($this->controllerName, $this->controllerMethod, array(),
+ $this->container);
+ }
+
+
+ /*
+ FIXME: this complains about shit headers which are already sent because
+ of the content length. Would be cool if someone could fix this
+
+ public function testOutputIsPrinted(){
+ $return = array(null, array(), $this->output);
+ $this->dispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->returnValue($return));
+
+ $this->expectOutputString($this->output);
+
+ App::main($this->controllerName, $this->controllerMethod, array(),
+ $this->container);
+ }
+ */
+
+ // FIXME: if someone manages to test the headers output, I'd be grateful
+
+
+}
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..246371d249ccfdd9674e199a130943b888a98795
--- /dev/null
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace Test\AppFramework\Controller;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+//require_once __DIR__ . "/../classloader.php";
+
+
+class ChildController extends Controller {};
+
+class ControllerTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var Controller
+ */
+ private $controller;
+ private $api;
+
+ protected function setUp(){
+ $request = new Request(
+ array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'),
+ 'urlParams' => array('name' => 'Johnny Weissmüller'),
+ 'files' => array('file' => 'filevalue'),
+ 'env' => array('PATH' => 'daheim'),
+ 'session' => array('sezession' => 'kein'),
+ 'method' => 'hi',
+ )
+ );
+
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('test'));
+ $this->api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('apptemplate_advanced'));
+
+ $this->controller = new ChildController($this->api, $request);
+ }
+
+
+ public function testParamsGet(){
+ $this->assertEquals('Johnny Weissmüller', $this->controller->params('name', 'Tarzan'));
+ }
+
+
+ public function testParamsGetDefault(){
+ $this->assertEquals('Tarzan', $this->controller->params('Ape Man', 'Tarzan'));
+ }
+
+
+ public function testParamsFile(){
+ $this->assertEquals('filevalue', $this->controller->params('file', 'filevalue'));
+ }
+
+
+ public function testGetUploadedFile(){
+ $this->assertEquals('filevalue', $this->controller->getUploadedFile('file'));
+ }
+
+
+
+ public function testGetUploadedFileDefault(){
+ $this->assertEquals('default', $this->controller->params('files', 'default'));
+ }
+
+
+ public function testGetParams(){
+ $params = array(
+ 'name' => 'Johnny Weissmüller',
+ 'nickname' => 'Janey',
+ );
+
+ $this->assertEquals($params, $this->controller->getParams());
+ }
+
+
+ public function testRender(){
+ $this->assertTrue($this->controller->render('') instanceof TemplateResponse);
+ }
+
+
+ public function testSetParams(){
+ $params = array('john' => 'foo');
+ $response = $this->controller->render('home', $params);
+
+ $this->assertEquals($params, $response->getParams());
+ }
+
+
+ public function testRenderRenderAs(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $this->controller = new ChildController($api, new Request());
+ $this->controller->render('home', array(), 'admin')->render();
+ }
+
+
+ public function testRenderHeaders(){
+ $headers = array('one', 'two');
+ $response = $this->controller->render('', array(), '', $headers);
+
+ $this->assertTrue(in_array($headers[0], $response->getHeaders()));
+ $this->assertTrue(in_array($headers[1], $response->getHeaders()));
+ }
+
+
+ public function testGetRequestMethod(){
+ $this->assertEquals('hi', $this->controller->method());
+ }
+
+
+ public function testGetEnvVariable(){
+ $this->assertEquals('daheim', $this->controller->env('PATH'));
+ }
+
+ public function testGetSessionVariable(){
+ $this->assertEquals('kein', $this->controller->session('sezession'));
+ }
+
+
+}
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..25fdd202839340ad233dff21caff16b8bb01e3b8
--- /dev/null
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\DependencyInjection;
+
+use \OC\AppFramework\Http\Request;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class DIContainerTest extends \PHPUnit_Framework_TestCase {
+
+ private $container;
+
+ protected function setUp(){
+ $this->container = new DIContainer('name');
+ $this->api = $this->getMock('OC\AppFramework\Core\API', array('getTrans'), array('hi'));
+ }
+
+ private function exchangeAPI(){
+ $this->api->expects($this->any())
+ ->method('getTrans')
+ ->will($this->returnValue('yo'));
+ $this->container['API'] = $this->api;
+ }
+
+ public function testProvidesAPI(){
+ $this->assertTrue(isset($this->container['API']));
+ }
+
+
+ public function testProvidesRequest(){
+ $this->assertTrue(isset($this->container['Request']));
+ }
+
+
+ public function testProvidesSecurityMiddleware(){
+ $this->assertTrue(isset($this->container['SecurityMiddleware']));
+ }
+
+
+ public function testProvidesMiddlewareDispatcher(){
+ $this->assertTrue(isset($this->container['MiddlewareDispatcher']));
+ }
+
+
+ public function testProvidesAppName(){
+ $this->assertTrue(isset($this->container['AppName']));
+ }
+
+
+ public function testAppNameIsSetCorrectly(){
+ $this->assertEquals('name', $this->container['AppName']);
+ }
+
+
+ public function testMiddlewareDispatcherIncludesSecurityMiddleware(){
+ $this->container['Request'] = new Request();
+ $security = $this->container['SecurityMiddleware'];
+ $dispatcher = $this->container['MiddlewareDispatcher'];
+
+ $this->assertContains($security, $dispatcher->getMiddlewares());
+ }
+
+
+ public function testMiddlewareDispatcherDoesNotIncludeTwigWhenTplDirectoryNotSet(){
+ $this->container['Request'] = new Request();
+ $this->exchangeAPI();
+ $dispatcher = $this->container['MiddlewareDispatcher'];
+
+ $this->assertEquals(1, count($dispatcher->getMiddlewares()));
+ }
+
+}
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..849b0ca97a68dcb1bb0456c0c87e1750427065cd
--- /dev/null
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -0,0 +1,218 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OC\AppFramework\Core\API;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class DispatcherTest extends \PHPUnit_Framework_TestCase {
+
+
+ private $middlewareDispatcher;
+ private $dispatcher;
+ private $controllerMethod;
+ private $response;
+ private $lastModified;
+ private $etag;
+ private $http;
+
+ protected function setUp() {
+ $this->controllerMethod = 'test';
+
+ $api = $this->getMockBuilder(
+ '\OC\AppFramework\Core\API')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $request = $this->getMockBuilder(
+ '\OC\AppFramework\Http\Request')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->http = $this->getMockBuilder(
+ '\OC\AppFramework\Http\Http')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->middlewareDispatcher = $this->getMockBuilder(
+ '\OC\AppFramework\Middleware\MiddlewareDispatcher')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->controller = $this->getMock(
+ '\OC\AppFramework\Controller\Controller',
+ array($this->controllerMethod), array($api, $request));
+
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher);
+
+ $this->response = $this->getMockBuilder(
+ '\OCP\AppFramework\Http\Response')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $this->etag = 'hi';
+ }
+
+
+ private function setMiddlewareExpections($out=null,
+ $httpHeaders=null, $responseHeaders=array(),
+ $ex=false, $catchEx=true) {
+
+ if($ex) {
+ $exception = new \Exception();
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->throwException($exception));
+ if($catchEx) {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterException')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($exception))
+ ->will($this->returnValue($this->response));
+ } else {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterException')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($exception))
+ ->will($this->returnValue(null));
+ return;
+ }
+ } else {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod));
+ $this->controller->expects($this->once())
+ ->method($this->controllerMethod)
+ ->will($this->returnValue($this->response));
+ }
+
+ $this->response->expects($this->once())
+ ->method('render')
+ ->will($this->returnValue($out));
+ $this->response->expects($this->once())
+ ->method('getStatus')
+ ->will($this->returnValue(Http::STATUS_OK));
+ $this->response->expects($this->once())
+ ->method('getLastModified')
+ ->will($this->returnValue($this->lastModified));
+ $this->response->expects($this->once())
+ ->method('getETag')
+ ->will($this->returnValue($this->etag));
+ $this->response->expects($this->once())
+ ->method('getHeaders')
+ ->will($this->returnValue($responseHeaders));
+ $this->http->expects($this->once())
+ ->method('getStatusHeader')
+ ->with($this->equalTo(Http::STATUS_OK),
+ $this->equalTo($this->lastModified),
+ $this->equalTo($this->etag))
+ ->will($this->returnValue($httpHeaders));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($this->response))
+ ->will($this->returnValue($this->response));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($this->response))
+ ->will($this->returnValue($this->response));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeOutput')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($out))
+ ->will($this->returnValue($out));
+
+
+ }
+
+
+ public function testDispatcherReturnsArrayWith2Entries() {
+ $this->setMiddlewareExpections();
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+ $this->assertNull($response[0]);
+ $this->assertEquals(array(), $response[1]);
+ $this->assertNull($response[2]);
+ }
+
+
+ public function testHeadersAndOutputAreReturned(){
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders);
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ $this->assertEquals($httpHeaders, $response[0]);
+ $this->assertEquals($responseHeaders, $response[1]);
+ $this->assertEquals($out, $response[2]);
+ }
+
+
+ public function testExceptionCallsAfterException() {
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true);
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ $this->assertEquals($httpHeaders, $response[0]);
+ $this->assertEquals($responseHeaders, $response[1]);
+ $this->assertEquals($out, $response[2]);
+ }
+
+
+ public function testExceptionThrowsIfCanNotBeHandledByAfterException() {
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
+
+ $this->setExpectedException('\Exception');
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ }
+
+}
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..64fe7992b6a83d8f50d345ab61d79e1805ac8b9f
--- /dev/null
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class ChildDownloadResponse extends DownloadResponse {};
+
+
+class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
+
+ protected $response;
+
+ protected function setUp(){
+ $this->response = new ChildDownloadResponse('file', 'content');
+ }
+
+
+ public function testHeaders() {
+ $headers = $this->response->getHeaders();
+
+ $this->assertContains('attachment; filename="file"', $headers['Content-Disposition']);
+ $this->assertContains('content', $headers['Content-Type']);
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..382d511b116449aa0ecda0047db07110ebbd93ad
--- /dev/null
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class HttpTest extends \PHPUnit_Framework_TestCase {
+
+ private $server;
+ private $http;
+
+ protected function setUp(){
+ $this->server = array();
+ $this->http = new Http($this->server);
+ }
+
+
+ public function testProtocol() {
+ $header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header);
+ }
+
+
+ public function testProtocol10() {
+ $this->http = new Http($this->server, 'HTTP/1.0');
+ $header = $this->http->getStatusHeader(Http::STATUS_OK);
+ $this->assertEquals('HTTP/1.0 200 OK', $header);
+ }
+
+
+ public function testEtagMatchReturnsNotModified() {
+ $http = new Http(array('HTTP_IF_NONE_MATCH' => 'hi'));
+
+ $header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
+ $this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+ }
+
+
+ public function testLastModifiedMatchReturnsNotModified() {
+ $dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
+ $dateTime->setTimestamp('12');
+
+ $http = new Http(
+ array(
+ 'HTTP_IF_MODIFIED_SINCE' => 'Thu, 01 Jan 1970 00:00:12 +0000')
+ );
+
+ $header = $http->getStatusHeader(Http::STATUS_OK, $dateTime);
+ $this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+ }
+
+
+
+ public function testTempRedirectBecomesFoundInHttp10() {
+ $http = new Http(array(), 'HTTP/1.0');
+
+ $header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->assertEquals('HTTP/1.0 302 Found', $header);
+ }
+ // TODO: write unittests for http codes
+
+}
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..534c54cbcee726f473c1b55d59162d95b20e01bb
--- /dev/null
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+use OCP\AppFramework\Http\JSONResponse;
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class JSONResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var JSONResponse
+ */
+ private $json;
+
+ protected function setUp() {
+ $this->json = new JSONResponse();
+ }
+
+
+ public function testHeader() {
+ $headers = $this->json->getHeaders();
+ $this->assertEquals('application/json; charset=utf-8', $headers['Content-type']);
+ }
+
+
+ public function testSetData() {
+ $params = array('hi', 'yo');
+ $this->json->setData($params);
+
+ $this->assertEquals(array('hi', 'yo'), $this->json->getData());
+ }
+
+
+ public function testSetRender() {
+ $params = array('test' => 'hi');
+ $this->json->setData($params);
+
+ $expected = '{"test":"hi"}';
+
+ $this->assertEquals($expected, $this->json->render());
+ }
+
+
+ public function testRender() {
+ $params = array('test' => 'hi');
+ $this->json->setData($params);
+
+ $expected = '{"test":"hi"}';
+
+ $this->assertEquals($expected, $this->json->render());
+ }
+
+
+ public function testShouldHaveXContentHeaderByDefault() {
+ $headers = $this->json->getHeaders();
+ $this->assertEquals('nosniff', $headers['X-Content-Type-Options']);
+ }
+
+
+ public function testConstructorAllowsToSetData() {
+ $data = array('hi');
+ $code = 300;
+ $response = new JSONResponse($data, $code);
+
+ $expected = '["hi"]';
+ $this->assertEquals($expected, $response->render());
+ $this->assertEquals($code, $response->getStatus());
+ }
+
+}
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1946655b0fa54ea6c95ab9cdb3fff6e0fbefe2a9
--- /dev/null
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
+
+
+ protected $response;
+
+ protected function setUp(){
+ $this->response = new RedirectResponse('/url');
+ }
+
+
+ public function testHeaders() {
+ $headers = $this->response->getHeaders();
+ $this->assertEquals('/url', $headers['Location']);
+ $this->assertEquals(Http::STATUS_TEMPORARY_REDIRECT,
+ $this->response->getStatus());
+ }
+
+
+ public function testGetRedirectUrl(){
+ $this->assertEquals('/url', $this->response->getRedirectUrl());
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0371c870cf292682b70a35a35fac70d3020f2468
--- /dev/null
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\AppFramework\Http;
+
+
+class RequestTest extends \PHPUnit_Framework_TestCase {
+
+ public function testRequestAccessors() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+
+ // Countable
+ $this->assertEquals(2, count($request));
+ // Array access
+ $this->assertEquals('Joey', $request['nickname']);
+ // "Magic" accessors
+ $this->assertEquals('Joey', $request->{'nickname'});
+ $this->assertTrue(isset($request['nickname']));
+ $this->assertTrue(isset($request->{'nickname'}));
+ $this->assertEquals(false, isset($request->{'flickname'}));
+ // Only testing 'get', but same approach for post, files etc.
+ $this->assertEquals('Joey', $request->get['nickname']);
+ // Always returns null if variable not set.
+ $this->assertEquals(null, $request->{'flickname'});
+ }
+
+ // urlParams has precedence over POST which has precedence over GET
+ public function testPrecedence() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'),
+ 'urlParams' => array('user' => 'jw', 'name' => 'Johnny Weissmüller'),
+ );
+
+ $request = new Request($vars);
+
+ $this->assertEquals(3, count($request));
+ $this->assertEquals('Janey', $request->{'nickname'});
+ $this->assertEquals('Johnny Weissmüller', $request->{'name'});
+ }
+
+
+ /**
+ * @expectedException RuntimeException
+ */
+ public function testImmutableArrayAccess() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+ $request['nickname'] = 'Janey';
+ }
+
+ /**
+ * @expectedException RuntimeException
+ */
+ public function testImmutableMagicAccess() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+ $request->{'nickname'} = 'Janey';
+ }
+
+}
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e09086f80172d3f4bd0a9245434560347b47363
--- /dev/null
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+use OCP\AppFramework\Http\Response;
+
+
+class ResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var \OCP\AppFramework\Http\Response
+ */
+ private $childResponse;
+
+ protected function setUp(){
+ $this->childResponse = new Response();
+ }
+
+
+ public function testAddHeader(){
+ $this->childResponse->addHeader('hello', 'world');
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('world', $headers['hello']);
+ }
+
+
+ public function testAddHeaderValueNullDeletesIt(){
+ $this->childResponse->addHeader('hello', 'world');
+ $this->childResponse->addHeader('hello', null);
+ $this->assertEquals(1, count($this->childResponse->getHeaders()));
+ }
+
+
+ public function testCacheHeadersAreDisabledByDefault(){
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
+ }
+
+
+ public function testRenderReturnNullByDefault(){
+ $this->assertEquals(null, $this->childResponse->render());
+ }
+
+
+ public function testGetStatus() {
+ $default = $this->childResponse->getStatus();
+
+ $this->childResponse->setStatus(Http::STATUS_NOT_FOUND);
+
+ $this->assertEquals(Http::STATUS_OK, $default);
+ $this->assertEquals(Http::STATUS_NOT_FOUND, $this->childResponse->getStatus());
+ }
+
+
+ public function testGetEtag() {
+ $this->childResponse->setEtag('hi');
+ $this->assertEquals('hi', $this->childResponse->getEtag());
+ }
+
+
+ public function testGetLastModified() {
+ $lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $lastModified->setTimestamp(1);
+ $this->childResponse->setLastModified($lastModified);
+ $this->assertEquals($lastModified, $this->childResponse->getLastModified());
+ }
+
+
+
+ public function testCacheSecondsZero() {
+ $this->childResponse->cacheFor(0);
+
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
+ }
+
+
+ public function testCacheSeconds() {
+ $this->childResponse->cacheFor(33);
+
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('max-age=33, must-revalidate',
+ $headers['Cache-Control']);
+ }
+
+
+
+ public function testEtagLastModifiedHeaders() {
+ $lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $lastModified->setTimestamp(1);
+ $this->childResponse->setLastModified($lastModified);
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c6d29cd3392bfcb1a7c9b07923a1578a7abe212
--- /dev/null
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var \OCP\AppFramework\Http\TemplateResponse
+ */
+ private $tpl;
+
+ /**
+ * @var \OCP\AppFramework\IApi
+ */
+ private $api;
+
+ protected function setUp() {
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('test'));
+ $this->api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+
+ $this->tpl = new TemplateResponse($this->api, 'home');
+ }
+
+
+ public function testSetParams(){
+ $params = array('hi' => 'yo');
+ $this->tpl->setParams($params);
+
+ $this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams());
+ }
+
+
+ public function testGetTemplateName(){
+ $this->assertEquals('home', $this->tpl->getTemplateName());
+ }
+
+
+ public function testRender(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+
+ $tpl->render();
+ }
+
+
+ public function testRenderAssignsParams(){
+ $params = array('john' => 'doe');
+
+ $ocTpl = $this->getMock('Template', array('assign', 'fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('assign')
+ ->with($this->equalTo('john'), $this->equalTo('doe'));
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+ $tpl->setParams($params);
+
+ $tpl->render();
+ }
+
+
+ public function testRenderDifferentApp(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app2'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home', 'app2');
+
+ $tpl->render();
+ }
+
+
+ public function testRenderDifferentRenderAs(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+ $tpl->renderAs('admin');
+
+ $tpl->render();
+ }
+
+
+ public function testGetRenderAs(){
+ $render = 'myrender';
+ $this->tpl->renderAs($render);
+ $this->assertEquals($render, $this->tpl->getRenderAs());
+ }
+
+}
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..43727846dcf3863af85aa4b14f272d060b805ec6
--- /dev/null
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -0,0 +1,285 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Middleware\Middleware;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OCP\AppFramework\Http\Response;
+
+
+// needed to test ordering
+class TestMiddleware extends Middleware {
+ public static $beforeControllerCalled = 0;
+ public static $afterControllerCalled = 0;
+ public static $afterExceptionCalled = 0;
+ public static $beforeOutputCalled = 0;
+
+ public $beforeControllerOrder = 0;
+ public $afterControllerOrder = 0;
+ public $afterExceptionOrder = 0;
+ public $beforeOutputOrder = 0;
+
+ public $controller;
+ public $methodName;
+ public $exception;
+ public $response;
+ public $output;
+
+ private $beforeControllerThrowsEx;
+
+ public function __construct($beforeControllerThrowsEx) {
+ self::$beforeControllerCalled = 0;
+ self::$afterControllerCalled = 0;
+ self::$afterExceptionCalled = 0;
+ self::$beforeOutputCalled = 0;
+ $this->beforeControllerThrowsEx = $beforeControllerThrowsEx;
+ }
+
+ public function beforeController($controller, $methodName){
+ self::$beforeControllerCalled++;
+ $this->beforeControllerOrder = self::$beforeControllerCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ if($this->beforeControllerThrowsEx){
+ throw new \Exception();
+ }
+ }
+
+ public function afterException($controller, $methodName, \Exception $exception){
+ self::$afterExceptionCalled++;
+ $this->afterExceptionOrder = self::$afterExceptionCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->exception = $exception;
+ parent::afterException($controller, $methodName, $exception);
+ }
+
+ public function afterController($controller, $methodName, Response $response){
+ self::$afterControllerCalled++;
+ $this->afterControllerOrder = self::$afterControllerCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->response = $response;
+ return parent::afterController($controller, $methodName, $response);
+ }
+
+ public function beforeOutput($controller, $methodName, $output){
+ self::$beforeOutputCalled++;
+ $this->beforeOutputOrder = self::$beforeOutputCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->output = $output;
+ return parent::beforeOutput($controller, $methodName, $output);
+ }
+}
+
+
+class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
+
+ public $exception;
+ public $response;
+ private $out;
+ private $method;
+ private $controller;
+
+ /**
+ * @var MiddlewareDispatcher
+ */
+ private $dispatcher;
+
+
+ public function setUp() {
+ $this->dispatcher = new MiddlewareDispatcher();
+ $this->controller = $this->getControllerMock();
+ $this->method = 'method';
+ $this->response = new Response();
+ $this->out = 'hi';
+ $this->exception = new \Exception();
+ }
+
+
+ private function getAPIMock(){
+ return $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('app'));
+ }
+
+
+ private function getControllerMock(){
+ return $this->getMock('OC\AppFramework\Controller\Controller', array('method'),
+ array($this->getAPIMock(), new Request()));
+ }
+
+
+ private function getMiddleware($beforeControllerThrowsEx=false){
+ $m1 = new TestMiddleware($beforeControllerThrowsEx);
+ $this->dispatcher->registerMiddleware($m1);
+ return $m1;
+ }
+
+
+ public function testAfterExceptionShouldReturnResponseOfMiddleware(){
+ $response = new Response();
+ $m1 = $this->getMock('\OC\AppFramework\Middleware\Middleware',
+ array('afterException', 'beforeController'));
+ $m1->expects($this->never())
+ ->method('afterException');
+
+ $m2 = $this->getMock('OC\AppFramework\Middleware\Middleware',
+ array('afterException', 'beforeController'));
+ $m2->expects($this->once())
+ ->method('afterException')
+ ->will($this->returnValue($response));
+
+ $this->dispatcher->registerMiddleware($m1);
+ $this->dispatcher->registerMiddleware($m2);
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->assertEquals($response, $this->dispatcher->afterException($this->controller, $this->method, $this->exception));
+ }
+
+
+ public function testAfterExceptionShouldThrowAgainWhenNotHandled(){
+ $m1 = new TestMiddleware(false);
+ $m2 = new TestMiddleware(true);
+
+ $this->dispatcher->registerMiddleware($m1);
+ $this->dispatcher->registerMiddleware($m2);
+
+ $this->setExpectedException('\Exception');
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+ }
+
+
+ public function testBeforeControllerCorrectArguments(){
+ $m1 = $this->getMiddleware();
+ $this->dispatcher->beforeController($this->controller, $this->method);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ }
+
+
+ public function testAfterControllerCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->dispatcher->afterController($this->controller, $this->method, $this->response);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->response, $m1->response);
+ }
+
+
+ public function testAfterExceptionCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->setExpectedException('\Exception');
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->exception, $m1->exception);
+ }
+
+
+ public function testBeforeOutputCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->out, $m1->output);
+ }
+
+
+ public function testBeforeControllerOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+
+ $this->assertEquals(1, $m1->beforeControllerOrder);
+ $this->assertEquals(2, $m2->beforeControllerOrder);
+ }
+
+ public function testAfterControllerOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->afterController($this->controller, $this->method, $this->response);
+
+ $this->assertEquals(2, $m1->afterControllerOrder);
+ $this->assertEquals(1, $m2->afterControllerOrder);
+ }
+
+
+ public function testAfterExceptionOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->setExpectedException('\Exception');
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+
+ $this->assertEquals(1, $m1->afterExceptionOrder);
+ $this->assertEquals(1, $m2->afterExceptionOrder);
+ }
+
+
+ public function testBeforeOutputOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals(2, $m1->beforeOutputOrder);
+ $this->assertEquals(1, $m2->beforeOutputOrder);
+ }
+
+
+ public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware(true);
+ $m3 = $this->getMock('\OC\AppFramework\Middleware\Middleware');
+ $m3->expects($this->never())
+ ->method('afterException');
+ $m3->expects($this->never())
+ ->method('beforeController');
+ $m3->expects($this->never())
+ ->method('afterController');
+
+ $this->dispatcher->registerMiddleware($m3);
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals(2, $m1->beforeOutputOrder);
+ $this->assertEquals(1, $m2->beforeOutputOrder);
+ }
+}
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5e2930ac6a36a426127e164286ae1093a8006680
--- /dev/null
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Middleware\Middleware;
+
+
+class ChildMiddleware extends Middleware {};
+
+
+class MiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var Middleware
+ */
+ private $middleware;
+ private $controller;
+ private $exception;
+ private $api;
+
+ protected function setUp(){
+ $this->middleware = new ChildMiddleware();
+
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array(), array('test'));
+
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($this->api, new Request()));
+ $this->exception = new \Exception();
+ $this->response = $this->getMock('OCP\AppFramework\Http\Response');
+ }
+
+
+ public function testBeforeController() {
+ $this->middleware->beforeController($this->controller, null);
+ $this->assertNull(null);
+ }
+
+
+ public function testAfterExceptionRaiseAgainWhenUnhandled() {
+ $this->setExpectedException('Exception');
+ $afterEx = $this->middleware->afterException($this->controller, null, $this->exception);
+ }
+
+
+ public function testAfterControllerReturnResponseWhenUnhandled() {
+ $response = $this->middleware->afterController($this->controller, null, $this->response);
+
+ $this->assertEquals($this->response, $response);
+ }
+
+
+ public function testBeforeOutputReturnOutputhenUnhandled() {
+ $output = $this->middleware->beforeOutput($this->controller, null, 'test');
+
+ $this->assertEquals('test', $output);
+ }
+
+
+}
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ed44282a7b0b3a625fd6ef88a2a67e90464123c
--- /dev/null
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -0,0 +1,296 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\JSONResponse;
+
+
+class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+ private $middleware;
+ private $controller;
+ private $secException;
+ private $secAjaxException;
+ private $request;
+
+ public function setUp() {
+ $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($api, new Request()));
+
+ $this->request = new Request();
+ $this->middleware = new SecurityMiddleware($api, $this->request);
+ $this->secException = new SecurityException('hey', false);
+ $this->secAjaxException = new SecurityException('hey', true);
+ }
+
+
+ private function getAPI(){
+ return $this->getMock('OC\AppFramework\Core\API',
+ array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser',
+ 'isSubAdminUser', 'activateNavigationEntry',
+ 'getUserId'),
+ array('app'));
+ }
+
+
+ private function checkNavEntry($method, $shouldBeActivated=false){
+ $api = $this->getAPI();
+
+ if($shouldBeActivated){
+ $api->expects($this->once())
+ ->method('activateNavigationEntry');
+ } else {
+ $api->expects($this->never())
+ ->method('activateNavigationEntry');
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ }
+
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testSetNavigationEntry(){
+ $this->checkNavEntry('testSetNavigationEntry', true);
+ }
+
+
+ private function ajaxExceptionStatus($method, $test, $status) {
+ $api = $this->getAPI();
+ $api->expects($this->any())
+ ->method($test)
+ ->will($this->returnValue(false));
+
+ // isAdminUser requires isLoggedIn call to return true
+ if ($test === 'isAdminUser') {
+ $api->expects($this->any())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+
+ try {
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
+ $method);
+ } catch (SecurityException $ex){
+ $this->assertEquals($status, $ex->getCode());
+ }
+ }
+
+ public function testAjaxStatusLoggedInCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusLoggedInCheck',
+ 'isLoggedIn',
+ Http::STATUS_UNAUTHORIZED
+ );
+ }
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testAjaxNotAdminCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxNotAdminCheck',
+ 'isAdminUser',
+ Http::STATUS_FORBIDDEN
+ );
+ }
+
+ /**
+ * @PublicPage
+ */
+ public function testAjaxStatusCSRFCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusCSRFCheck',
+ 'passesCSRFCheck',
+ Http::STATUS_PRECONDITION_FAILED
+ );
+ }
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testAjaxStatusAllGood() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isLoggedIn',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isAdminUser',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isSubAdminUser',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'passesCSRFCheck',
+ 0
+ );
+ }
+
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testNoChecks(){
+ $api = $this->getAPI();
+ $api->expects($this->never())
+ ->method('passesCSRFCheck')
+ ->will($this->returnValue(true));
+ $api->expects($this->never())
+ ->method('isAdminUser')
+ ->will($this->returnValue(true));
+ $api->expects($this->never())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+
+ $sec = new SecurityMiddleware($api, $this->request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
+ 'testNoChecks');
+ }
+
+
+ private function securityCheck($method, $expects, $shouldFail=false){
+ $api = $this->getAPI();
+ $api->expects($this->once())
+ ->method($expects)
+ ->will($this->returnValue(!$shouldFail));
+
+ // admin check requires login
+ if ($expects === 'isAdminUser') {
+ $api->expects($this->once())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+
+ if($shouldFail){
+ $this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException');
+ } else {
+ $this->setExpectedException(null);
+ }
+
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ }
+
+
+ /**
+ * @PublicPage
+ */
+ public function testCsrfCheck(){
+ $this->securityCheck('testCsrfCheck', 'passesCSRFCheck');
+ }
+
+
+ /**
+ * @PublicPage
+ */
+ public function testFailCsrfCheck(){
+ $this->securityCheck('testFailCsrfCheck', 'passesCSRFCheck', true);
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testLoggedInCheck(){
+ $this->securityCheck('testLoggedInCheck', 'isLoggedIn');
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testFailLoggedInCheck(){
+ $this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true);
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ */
+ public function testIsAdminCheck(){
+ $this->securityCheck('testIsAdminCheck', 'isAdminUser');
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ */
+ public function testFailIsAdminCheck(){
+ $this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true);
+ }
+
+
+ public function testAfterExceptionNotCaughtThrowsItAgain(){
+ $ex = new \Exception();
+ $this->setExpectedException('\Exception');
+ $this->middleware->afterException($this->controller, 'test', $ex);
+ }
+
+
+ public function testAfterExceptionReturnsRedirect(){
+ $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($api, new Request()));
+
+ $this->request = new Request(
+ array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')));
+ $this->middleware = new SecurityMiddleware($api, $this->request);
+ $response = $this->middleware->afterException($this->controller, 'test',
+ $this->secException);
+
+ $this->assertTrue($response instanceof RedirectResponse);
+ }
+
+
+ public function testAfterAjaxExceptionReturnsJSONError(){
+ $response = $this->middleware->afterException($this->controller, 'test',
+ $this->secAjaxException);
+
+ $this->assertTrue($response instanceof JSONResponse);
+ }
+
+
+}
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7aa922db12becd05a88115ca7608275d466f70f
--- /dev/null
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace OC\AppFramework\Routing;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+use OC\AppFramework\routing\RouteConfig;
+
+
+class RouteConfigTest extends \PHPUnit_Framework_TestCase
+{
+
+ public function testSimpleRoute()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ public function testSimpleRouteWithMissingVerb()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ public function testSimpleRouteWithLowercaseVerb()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ /**
+ * @expectedException \UnexpectedValueException
+ */
+ public function testSimpleRouteWithBrokenName()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $routes);
+
+ $config->register();
+ }
+
+ public function testSimpleRouteWithUnderScoreNames()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ $this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent');
+ }
+
+ public function testResource()
+ {
+ $routes = array('resources' => array('accounts' => array('url' => '/accounts')));
+
+ $this->assertResource($routes, 'accounts', '/accounts', 'AccountsController', 'accountId');
+ }
+
+ public function testResourceWithUnderScoreName()
+ {
+ $routes = array('resources' => array('admin_accounts' => array('url' => '/admin/accounts')));
+
+ $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountId');
+ }
+
+ private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName)
+ {
+ // route mocks
+ $route = $this->mockRoute($verb, $controllerName, $actionName);
+
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // we expect create to be called once:
+ $router
+ ->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo('app1.' . $name), $this->equalTo($url))
+ ->will($this->returnValue($route));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $routes);
+
+ $config->register();
+ }
+
+ private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName)
+ {
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // route mocks
+ $indexRoute = $this->mockRoute('GET', $controllerName, 'index');
+ $showRoute = $this->mockRoute('GET', $controllerName, 'show');
+ $createRoute = $this->mockRoute('POST', $controllerName, 'create');
+ $updateRoute = $this->mockRoute('PUT', $controllerName, 'update');
+ $destroyRoute = $this->mockRoute('DELETE', $controllerName, 'destroy');
+
+ $urlWithParam = $url . '/{' . $paramName . '}';
+
+ // we expect create to be called once:
+ $router
+ ->expects($this->at(0))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.index'), $this->equalTo($url))
+ ->will($this->returnValue($indexRoute));
+
+ $router
+ ->expects($this->at(1))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.show'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($showRoute));
+
+ $router
+ ->expects($this->at(2))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.create'), $this->equalTo($url))
+ ->will($this->returnValue($createRoute));
+
+ $router
+ ->expects($this->at(3))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.update'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($updateRoute));
+
+ $router
+ ->expects($this->at(4))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.destroy'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($destroyRoute));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $yaml);
+
+ $config->register();
+ }
+
+ /**
+ * @param $verb
+ * @param $controllerName
+ * @param $actionName
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function mockRoute($verb, $controllerName, $actionName)
+ {
+ $container = new DIContainer('app1');
+ $route = $this->getMock("\OC_Route", array('method', 'action'), array(), '', false);
+ $route
+ ->expects($this->exactly(1))
+ ->method('method')
+ ->with($this->equalTo($verb))
+ ->will($this->returnValue($route));
+
+ $route
+ ->expects($this->exactly(1))
+ ->method('action')
+ ->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName)))
+ ->will($this->returnValue($route));
+ return $route;
+ }
+
+}
+
+/*
+#
+# sample routes.yaml for ownCloud
+#
+# the section simple describes one route
+
+routes:
+ - name: folders#open
+ url: /folders/{folderId}/open
+ verb: GET
+ # controller: name.split()[0]
+ # action: name.split()[1]
+
+# for a resource following actions will be generated:
+# - index
+# - create
+# - show
+# - update
+# - destroy
+# - new
+resources:
+ accounts:
+ url: /accounts
+
+ folders:
+ url: /accounts/{accountId}/folders
+ # actions can be used to define additional actions on the resource
+ actions:
+ - name: validate
+ verb: GET
+ on-collection: false
+
+ * */
diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c68812aa5c76dbcb3c76ea4a1d0e50893c368c98
--- /dev/null
+++ b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase {
+
+
+ /**
+ * @Annotation
+ */
+ public function testReadAnnotation(){
+ $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
+ 'testReadAnnotation');
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ }
+
+
+ /**
+ * @Annotation
+ * @param test
+ */
+ public function testReadAnnotationNoLowercase(){
+ $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
+ 'testReadAnnotationNoLowercase');
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ $this->assertFalse($reader->hasAnnotation('param'));
+ }
+
+
+}
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
new file mode 100644
index 0000000000000000000000000000000000000000..1c5195f8eb1952d6174c8c7c04770509ee0cbfb0
--- /dev/null
+++ b/tests/lib/avatar.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Avatar extends PHPUnit_Framework_TestCase {
+
+ public function testAvatar() {
+ $this->markTestSkipped("Setting custom avatars with encryption doesn't work yet");
+
+ $avatar = new \OC_Avatar(\OC_User::getUser());
+
+ $this->assertEquals(false, $avatar->get());
+
+ $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
+ $avatar->set($expected->data());
+ $expected->resize(64);
+ $this->assertEquals($expected->data(), $avatar->get()->data());
+
+ $avatar->remove();
+ $this->assertEquals(false, $avatar->get());
+ }
+}
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 51edbf7b309bdfd9c6608aa7ebbb23311511ed2e..c87bee4ab99781cad34878f1622d7c306607a9e7 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -15,7 +15,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
public function setUp() {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
- $r = '_'.OC_Util::generate_random_bytes('4').'_';
+ $r = '_'.OC_Util::generateRandomBytes('4').'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( self::$schema_file, $content );
@@ -145,4 +145,42 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$this->assertEquals(1, $result->numRows());
}
+
+ /**
+ * Tests whether the database is configured so it accepts and returns dates
+ * in the expected format.
+ */
+ public function testTimestampDateFormat() {
+ $table = '*PREFIX*'.$this->test_prefix.'timestamp';
+ $column = 'timestamptest';
+
+ $expectedFormat = 'Y-m-d H:i:s';
+ $expected = new \DateTime;
+
+ $query = OC_DB::prepare("INSERT INTO `$table` (`$column`) VALUES (?)");
+ $result = $query->execute(array($expected->format($expectedFormat)));
+ $this->assertEquals(
+ 1,
+ $result,
+ "Database failed to accept dates in the format '$expectedFormat'."
+ );
+
+ $id = OC_DB::insertid($table);
+ $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `id` = ?");
+ $result = $query->execute(array($id));
+ $row = $result->fetchRow();
+
+ $actual = \DateTime::createFromFormat($expectedFormat, $row[$column]);
+ $this->assertInstanceOf(
+ '\DateTime',
+ $actual,
+ "Database failed to return dates in the format '$expectedFormat'."
+ );
+
+ $this->assertEquals(
+ $expected,
+ $actual,
+ 'Failed asserting that the returned date is the same as the inserted.'
+ );
+ }
}
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index c2e55eabf4b6b18026fec3732c135f2d1365cd90..7de90c047caa091bb370e8a642f8933b835efa6c 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
- $r = '_'.OC_Util::generate_random_bytes('4').'_';
+ $r = '_'.OC_Util::generateRandomBytes('4').'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( $this->schema_file, $content );
diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..76938a0dcc8bcb44601d60974c6e035a2b433915
--- /dev/null
+++ b/tests/lib/files/node/file.php
@@ -0,0 +1,664 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\View;
+
+class File extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testDelete() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->exactly(2))
+ ->method('emit')
+ ->will($this->returnValue(true));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('unlink')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testDeleteHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\File', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $test->assertEquals(1, $node->getId());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\NonExistingFile', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preDelete', $preListener);
+ $root->listen('\OC\Files', 'postDelete', $postListener);
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $view->expects($this->once())
+ ->method('unlink')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testDeleteNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testGetContent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('file_get_contents')
+ ->with('/bar/foo')
+ ->will($this->returnValue('bar'));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('bar', $node->getContent());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testGetContentNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => 0)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->getContent();
+ }
+
+ public function testPutContent() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('file_put_contents')
+ ->with('/bar/foo', 'bar')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->putContent('bar');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testPutContentNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->putContent('bar');
+ }
+
+ public function testGetMimeType() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->once())
+ ->method('getMimeType')
+ ->with('/bar/foo')
+ ->will($this->returnValue('text/plain'));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('text/plain', $node->getMimeType());
+ }
+
+ public function testFOpenRead() {
+ $stream = fopen('php://memory', 'w+');
+ fwrite($stream, 'bar');
+ rewind($stream);
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('fopen')
+ ->with('/bar/foo', 'r')
+ ->will($this->returnValue($stream));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $fh = $node->fopen('r');
+ $this->assertEquals($stream, $fh);
+ $this->assertEquals('bar', fread($fh, 3));
+ }
+
+ public function testFOpenWrite() {
+ $stream = fopen('php://memory', 'w+');
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, new $view, $this->user);
+
+ $hooksCalled = 0;
+ $hook = function ($file) use (&$hooksCalled) {
+ $hooksCalled++;
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('fopen')
+ ->with('/bar/foo', 'w')
+ ->will($this->returnValue($stream));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $fh = $node->fopen('w');
+ $this->assertEquals($stream, $fh);
+ fwrite($fh, 'bar');
+ rewind($fh);
+ $this->assertEquals('bar', fread($stream, 3));
+ $this->assertEquals(2, $hooksCalled);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => 0)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('r');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadWriteNoReadPermissions() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function () {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_UPDATE)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('w');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadWriteNoWritePermissions() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, new $view, $this->user);
+
+ $hook = function () {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('w');
+ }
+
+ public function testCopySameStorage() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('copy')
+ ->with('/bar/foo', '/bar/asd');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 3)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+ $newNode = new \OC\Files\Node\File($root, $view, '/bar/asd');
+
+ $root->expects($this->exactly(2))
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar/asd', $newNode),
+ array('/bar', $parentNode)
+ )));
+
+ $target = $node->copy('/bar/asd');
+ $this->assertInstanceOf('\OC\Files\Node\File', $target);
+ $this->assertEquals(3, $target->getId());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testCopyNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $root->expects($this->never())
+ ->method('getMount');
+
+ $storage->expects($this->never())
+ ->method('copy');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ, 'fileid' => 3)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar', $parentNode)
+ )));
+
+ $node->copy('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testCopyNoParent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('copy');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/asd')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node->copy('/bar/asd/foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testCopyParentIsFile() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('copy');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\File($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar', $parentNode)
+ )));
+
+ $node->copy('/bar/asd');
+ }
+
+ public function testMoveSameStorage() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('rename')
+ ->with('/bar/foo', '/bar/asd');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->any())
+ ->method('get')
+ ->will($this->returnValueMap(array(array('/bar', $parentNode), array('/bar/asd', $node))));
+
+ $target = $node->move('/bar/asd');
+ $this->assertInstanceOf('\OC\Files\Node\File', $target);
+ $this->assertEquals(1, $target->getId());
+ $this->assertEquals('/bar/asd', $node->getPath());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testMoveNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $view->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->returnValue($parentNode));
+
+ $node->move('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testMoveNoParent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $storage->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node->move('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testMoveParentIsFile() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\File($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->returnValue($parentNode));
+
+ $node->move('/bar/asd');
+ }
+}
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1589a276ba4cacca3dfcecc707e5287b3c103fa
--- /dev/null
+++ b/tests/lib/files/node/folder.php
@@ -0,0 +1,479 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Node\Node;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\View;
+
+class Folder extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testDelete() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $root->expects($this->exactly(2))
+ ->method('emit')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('rmdir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testDeleteHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\Folder', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\NonExistingFolder', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preDelete', $preListener);
+ $root->listen('\OC\Files', 'postDelete', $postListener);
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $view->expects($this->once())
+ ->method('rmdir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testDeleteNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testGetDirectoryContent() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $cache->expects($this->any())
+ ->method('getStatus')
+ ->with('foo')
+ ->will($this->returnValue(Cache::COMPLETE));
+
+ $cache->expects($this->once())
+ ->method('getFolderContents')
+ ->with('foo')
+ ->will($this->returnValue(array(
+ array('fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'),
+ array('fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory')
+ )));
+
+ $permissionsCache = $this->getMock('\OC\Files\Cache\Permissions', array(), array('/'));
+ $permissionsCache->expects($this->once())
+ ->method('getDirectoryPermissions')
+ ->will($this->returnValue(array(2 => \OCP\PERMISSION_ALL)));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array()));
+
+ $storage->expects($this->any())
+ ->method('getPermissionsCache')
+ ->will($this->returnValue($permissionsCache));
+ $storage->expects($this->any())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $children = $node->getDirectoryListing();
+ $this->assertEquals(2, count($children));
+ $this->assertInstanceOf('\OC\Files\Node\File', $children[0]);
+ $this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
+ $this->assertEquals('asd', $children[0]->getName());
+ $this->assertEquals('qwerty', $children[1]->getName());
+ }
+
+ public function testGet() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd');
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->get('asd');
+ }
+
+ public function testNodeExists() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue($child));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertTrue($node->nodeExists('asd'));
+ }
+
+ public function testNodeExistsNotExists() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertFalse($node->nodeExists('asd'));
+ }
+
+ public function testNewFolder() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('mkdir')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd');
+ $result = $node->newFolder('asd');
+ $this->assertEquals($child, $result);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testNewFolderNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->newFolder('asd');
+ }
+
+ public function testNewFile() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $child = new \OC\Files\Node\File($root, $view, '/bar/foo/asd');
+ $result = $node->newFile('asd');
+ $this->assertEquals($child, $result);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testNewFileNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->newFile('asd');
+ }
+
+ public function testGetFreeSpace() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('free_space')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertEquals(100, $node->getFreeSpace());
+ }
+
+ public function testSearch() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+
+ $storage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $cache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array()));
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $result = $node->search('qw');
+ $this->assertEquals(1, count($result));
+ $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+ }
+
+ public function testSearchSubStorages() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $subCache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $subStorage = $this->getMock('\OC\Files\Storage\Storage');
+ $subMount = $this->getMock('\OC\Files\Mount\Mount', array(), array(null, ''));
+
+ $subMount->expects($this->once())
+ ->method('getStorage')
+ ->will($this->returnValue($subStorage));
+
+ $subMount->expects($this->once())
+ ->method('getMountPoint')
+ ->will($this->returnValue('/bar/foo/bar/'));
+
+ $storage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $subStorage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($subCache));
+
+ $cache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $subCache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 4, 'path' => 'asd/qweasd', 'name' => 'qweasd', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($subMount)));
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $result = $node->search('qw');
+ $this->assertEquals(2, count($result));
+ }
+
+ public function testIsSubNode() {
+ $file = new Node(null, null, '/foo/bar');
+ $folder = new \OC\Files\Node\Folder(null, null, '/foo');
+ $this->assertTrue($folder->isSubNode($file));
+ $this->assertFalse($folder->isSubNode($folder));
+
+ $file = new Node(null, null, '/foobar');
+ $this->assertFalse($folder->isSubNode($file));
+ }
+}
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
new file mode 100644
index 0000000000000000000000000000000000000000..14e1d05853d9c133d532d8700a14373dcd43a0e2
--- /dev/null
+++ b/tests/lib/files/node/integration.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Mount\Manager;
+use OC\Files\Node\Root;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\Storage\Temporary;
+use OC\Files\View;
+use OC\User\User;
+
+class IntegrationTests extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var \OC\Files\Node\Root $root
+ */
+ private $root;
+
+ /**
+ * @var \OC\Files\Storage\Storage[]
+ */
+ private $storages;
+
+ /**
+ * @var \OC\Files\View $view
+ */
+ private $view;
+
+ public function setUp() {
+ \OC\Files\Filesystem::init('', '');
+ \OC\Files\Filesystem::clearMounts();
+ $manager = \OC\Files\Filesystem::getMountManager();
+
+ \OC_Hook::clear('OC_Filesystem');
+
+ \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
+
+ $user = new User(uniqid('user'), new \OC_User_Dummy);
+ \OC_User::setUserId($user->getUID());
+ $this->view = new View();
+ $this->root = new Root($manager, $this->view, $user);
+ $storage = new Temporary(array());
+ $subStorage = new Temporary(array());
+ $this->storages[] = $storage;
+ $this->storages[] = $subStorage;
+ $this->root->mount($storage, '/');
+ $this->root->mount($subStorage, '/substorage/');
+ }
+
+ public function tearDown() {
+ foreach ($this->storages as $storage) {
+ $storage->getCache()->clear();
+ }
+ \OC\Files\Filesystem::clearMounts();
+ }
+
+ public function testBasicFile() {
+ $file = $this->root->newFile('/foo.txt');
+ $this->assertCount(2, $this->root->getDirectoryListing());
+ $this->assertTrue($this->root->nodeExists('/foo.txt'));
+ $id = $file->getId();
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $file->putContent('qwerty');
+ $this->assertEquals('text/plain', $file->getMimeType());
+ $this->assertEquals('qwerty', $file->getContent());
+ $this->assertFalse($this->root->nodeExists('/bar.txt'));
+ $file->move('/bar.txt');
+ $this->assertFalse($this->root->nodeExists('/foo.txt'));
+ $this->assertTrue($this->root->nodeExists('/bar.txt'));
+ $this->assertEquals('bar.txt', $file->getName());
+ $this->assertEquals('bar.txt', $file->getInternalPath());
+
+ $file->move('/substorage/bar.txt');
+ $this->assertNotEquals($id, $file->getId());
+ $this->assertEquals('qwerty', $file->getContent());
+ }
+
+ public function testBasicFolder() {
+ $folder = $this->root->newFolder('/foo');
+ $this->assertTrue($this->root->nodeExists('/foo'));
+ $file = $folder->newFile('/bar');
+ $this->assertTrue($this->root->nodeExists('/foo/bar'));
+ $file->putContent('qwerty');
+
+ $listing = $folder->getDirectoryListing();
+ $this->assertEquals(1, count($listing));
+ $this->assertEquals($file->getId(), $listing[0]->getId());
+ $this->assertEquals($file->getStorage(), $listing[0]->getStorage());
+
+
+ $rootListing = $this->root->getDirectoryListing();
+ $this->assertEquals(2, count($rootListing));
+
+ $folder->move('/asd');
+ /**
+ * @var \OC\Files\Node\File $file
+ */
+ $file = $folder->get('/bar');
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $this->assertFalse($this->root->nodeExists('/foo/bar'));
+ $this->assertTrue($this->root->nodeExists('/asd/bar'));
+ $this->assertEquals('qwerty', $file->getContent());
+ $folder->move('/substorage/foo');
+ /**
+ * @var \OC\Files\Node\File $file
+ */
+ $file = $folder->get('/bar');
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $this->assertTrue($this->root->nodeExists('/substorage/foo/bar'));
+ $this->assertEquals('qwerty', $file->getContent());
+ }
+}
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf5fec30522124ec39d6745d8f01e5555d757348
--- /dev/null
+++ b/tests/lib/files/node/node.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+class Node extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testStat() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50,
+ 'permissions' => 0
+ );
+
+ $view->expects($this->once())
+ ->method('stat')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals($stat, $node->stat());
+ }
+
+ public function testGetId() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50
+ );
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(1, $node->getId());
+ }
+
+ public function testGetSize() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('filesize')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(100, $node->getSize());
+ }
+
+ public function testGetEtag() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50
+ );
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('qwerty', $node->getEtag());
+ }
+
+ public function testGetMTime() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('filemtime')
+ ->with('/bar/foo')
+ ->will($this->returnValue(50));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(50, $node->getMTime());
+ }
+
+ public function testGetStorage() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals($storage, $node->getStorage());
+ }
+
+ public function testGetPath() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('/bar/foo', $node->getPath());
+ }
+
+ public function testGetInternalPath() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('foo', $node->getInternalPath());
+ }
+
+ public function testGetName() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('foo', $node->getName());
+ }
+
+ public function testTouchSetMTime() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo', 100)
+ ->will($this->returnValue(true));
+
+ $view->expects($this->once())
+ ->method('filemtime')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ $this->assertEquals(100, $node->getMTime());
+ }
+
+ public function testTouchHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preTouch', $preListener);
+ $root->listen('\OC\Files', 'postTouch', $postListener);
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo', 100)
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testTouchNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ }
+}
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
new file mode 100644
index 0000000000000000000000000000000000000000..97eaf7f716267fc812fa7267d5a0844938ea2047
--- /dev/null
+++ b/tests/lib/files/node/root.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OCP\Files\NotPermittedException;
+use OC\Files\Mount\Manager;
+
+class Root extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testGet() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('fileid' => 10, 'path' => 'bar/foo', 'name', 'mimetype' => 'text/plain')));
+
+ $view->expects($this->once())
+ ->method('is_dir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(false));
+
+ $view->expects($this->once())
+ ->method('file_exists')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $root->mount($storage, '');
+ $node = $root->get('/bar/foo');
+ $this->assertEquals(10, $node->getId());
+ $this->assertInstanceOf('\OC\Files\Node\File', $node);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testGetNotFound() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $view->expects($this->once())
+ ->method('file_exists')
+ ->with('/bar/foo')
+ ->will($this->returnValue(false));
+
+ $root->mount($storage, '');
+ $root->get('/bar/foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testGetInvalidPath() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $root->get('/../foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testGetNoStorages() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $root->get('/bar/foo');
+ }
+}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 3bac9e770aa1b73fa81bd0b162a3c83618bdc8ce..0de436f570a5ddbc35b0ecf37293a50ef98fd408 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -25,7 +25,7 @@ class View extends \PHPUnit_Framework_TestCase {
//login
\OC_User::createUser('test', 'test');
- $this->user=\OC_User::getUser();
+ $this->user = \OC_User::getUser();
\OC_User::setUserId('test');
\OC\Files\Filesystem::clearMounts();
@@ -325,6 +325,35 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
}
+ /**
+ * @medium
+ */
+ function testViewHooks() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ $defaultRoot = \OC\Files\Filesystem::getRoot();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '/substorage');
+ \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
+
+ $rootView = new \OC\Files\View('');
+ $subView = new \OC\Files\View($defaultRoot . '/substorage');
+ $this->hookPath = null;
+
+ $rootView->file_put_contents('/foo.txt', 'asd');
+ $this->assertNull($this->hookPath);
+
+ $subView->file_put_contents('/foo.txt', 'asd');
+ $this->assertNotNull($this->hookPath);
+ $this->assertEquals('/substorage/foo.txt', $this->hookPath);
+ }
+
+ private $hookPath;
+
+ function dummyHook($params) {
+ $this->hookPath = $params['path'];
+ }
+
/**
* @param bool $scan
* @return \OC\Files\Storage\Storage
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 67b5a3d43ecc509bd56822e0df00341ea05cb881..b4d896e51967effe1b6a1b55b08f936e9a27fedb 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -8,40 +8,42 @@
class Test_Helper extends PHPUnit_Framework_TestCase {
- function testHumanFileSize() {
- $result = OC_Helper::humanFileSize(0);
- $expected = '0 B';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(1024);
- $expected = '1 kB';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(10000000);
- $expected = '9.5 MB';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(500000000000);
- $expected = '465.7 GB';
- $this->assertEquals($result, $expected);
+ /**
+ * @dataProvider humanFileSizeProvider
+ */
+ public function testHumanFileSize($expected, $input)
+ {
+ $result = OC_Helper::humanFileSize($input);
+ $this->assertEquals($expected, $result);
}
- function testComputerFileSize() {
- $result = OC_Helper::computerFileSize("0 B");
- $expected = '0.0';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::computerFileSize("1 kB");
- $expected = '1024.0';
- $this->assertEquals($result, $expected);
+ public function humanFileSizeProvider()
+ {
+ return array(
+ array('0 B', 0),
+ array('1 kB', 1024),
+ array('9.5 MB', 10000000),
+ array('465.7 GB', 500000000000),
+ array('454.7 TB', 500000000000000),
+ array('444.1 PB', 500000000000000000),
+ );
+ }
- $result = OC_Helper::computerFileSize("9.5 MB");
- $expected = '9961472.0';
- $this->assertEquals($result, $expected);
+ /**
+ * @dataProvider computerFileSizeProvider
+ */
+ function testComputerFileSize($expected, $input) {
+ $result = OC_Helper::computerFileSize($input);
+ $this->assertEquals($expected, $result);
+ }
- $result = OC_Helper::computerFileSize("465.7 GB");
- $expected = '500041567436.8';
- $this->assertEquals($result, $expected);
+ function computerFileSizeProvider(){
+ return array(
+ array(0.0, "0 B"),
+ array(1024.0, "1 kB"),
+ array(9961472.0, "9.5 MB"),
+ array(500041567436.8, "465.7 GB"),
+ );
}
function testGetMimeType() {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index e7d441a7e780db7ff1c8d20a0a498c8d4a8863a3..e02b0e4354d1bda4c359895afe328439cf74d7d0 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -29,6 +29,8 @@ class Test_Share extends PHPUnit_Framework_TestCase {
protected $group1;
protected $group2;
protected $resharing;
+ protected $dateInFuture;
+ protected $dateInPast;
public function setUp() {
OC_User::clearBackends();
@@ -58,6 +60,12 @@ class Test_Share extends PHPUnit_Framework_TestCase {
OC::registerShareHooks();
$this->resharing = OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes');
OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+
+ // 20 Minutes in the past, 20 minutes in the future.
+ $now = time();
+ $dateFormat = 'Y-m-d H:i:s';
+ $this->dateInPast = date($dateFormat, $now - 20 * 60);
+ $this->dateInFuture = date($dateFormat, $now + 20 * 60);
}
public function tearDown() {
@@ -121,6 +129,26 @@ class Test_Share extends PHPUnit_Framework_TestCase {
}
}
+ protected function shareUserOneTestFileWithUserTwo() {
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ),
+ 'Failed asserting that user 1 successfully shared text.txt with user 2.'
+ );
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that test.txt is a shared file of user 1.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 has access to test.txt after initial sharing.'
+ );
+ }
+
public function testShareWithUser() {
// Invalid shares
$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
@@ -146,10 +174,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
}
// Valid share
- $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
- $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user2);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
+ $this->shareUserOneTestFileWithUserTwo();
// Attempt to share again
OC_User::setUserId($this->user1);
@@ -264,6 +289,66 @@ class Test_Share extends PHPUnit_Framework_TestCase {
$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
}
+ public function testShareWithUserExpirationExpired() {
+ $this->shareUserOneTestFileWithUserTwo();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInPast),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 no longer has access to test.txt after expiration.'
+ );
+ }
+
+ public function testShareWithUserExpirationValid() {
+ $this->shareUserOneTestFileWithUserTwo();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInFuture),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 still has access to test.txt after expiration date has been set.'
+ );
+ }
+
+ protected function shareUserOneTestFileWithGroupOne() {
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ),
+ 'Failed asserting that user 1 successfully shared text.txt with group 1.'
+ );
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that test.txt is a shared file of user 1.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 has access to test.txt after initial sharing.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 3 has access to test.txt after initial sharing.'
+ );
+ }
+
public function testShareWithGroup() {
// Invalid shares
$message = 'Sharing test.txt failed, because the group foobar does not exist';
@@ -285,12 +370,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
OC_Appconfig::setValue('core', 'shareapi_share_policy', $policy);
// Valid share
- $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ));
- $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user2);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user3);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
+ $this->shareUserOneTestFileWithGroupOne();
// Attempt to share again
OC_User::setUserId($this->user1);
@@ -410,4 +490,49 @@ class Test_Share extends PHPUnit_Framework_TestCase {
$this->assertEquals(array(), OCP\Share::getItemsShared('test'));
}
+ public function testShareWithGroupExpirationExpired() {
+ $this->shareUserOneTestFileWithGroupOne();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInPast),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 no longer has access to test.txt after expiration.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 3 no longer has access to test.txt after expiration.'
+ );
+ }
+
+ public function testShareWithGroupExpirationValid() {
+ $this->shareUserOneTestFileWithGroupOne();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInFuture),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 still has access to test.txt after expiration date has been set.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 3 still has access to test.txt after expiration date has been set.'
+ );
+ }
}
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 13aa49c8c6f606164a657e08ad1664e4c588bd82..d607a3e77256ec02ae75beb29cc761b6762e9bad 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -71,8 +71,8 @@ class Test_Util extends PHPUnit_Framework_TestCase {
$this->assertTrue(\OC_Util::isInternetConnectionEnabled());
}
- function testGenerate_random_bytes() {
- $result = strlen(OC_Util::generate_random_bytes(59));
+ function testGenerateRandomBytes() {
+ $result = strlen(OC_Util::generateRandomBytes(59));
$this->assertEquals(59, $result);
}