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..9ccd4cc299a17ad114bd7a3a1604b1c375de281e 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'] = \OCP\Preview::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'] = \OCP\Preview::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'] = \OCP\Preview::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 06088b30fff1b43591e3b7bdc292523d01dfc6f1..ff593fc4d247e36db8785966dbb07be149e8f4cb 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -336,6 +336,27 @@ 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;
+}
.oc-dialog .fileexists table {
width: 100%;
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 e5b3f807580747232790aa56d7c20b8adb81cedc..28270f139389233b2a136bc2357b41d2d5bb56fd 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -298,8 +298,15 @@ $(document).ready(function() {
start: function(e) {
OC.Upload.logStatus('start', e, null);
},
- submit: function (e, data) {
+ submit: function(e, data) {
OC.Upload.rememberUpload(data);
+ if ( ! data.formData ) {
+ // noone set update parameters, we set the minimum
+ data.formData = {
+ requesttoken: oc_requesttoken,
+ dir: $('#dir').val()
+ };
+ }
},
fail: function(e, data) {
OC.Upload.logStatus('fail', e, data);
@@ -421,9 +428,7 @@ $(document).ready(function() {
// http://stackoverflow.com/a/6700/11236
var size = 0, key;
for (key in obj) {
- if (obj.hasOwnProperty(key)) {
- size++;
- }
+ if (obj.hasOwnProperty(key)) size++;
}
return size;
};
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 703e543bf4bd74710f484e0d201769a995d6b9e6..af7c757276e0040cea088ece555509a591ec7f5d 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 49d7afa9b5c85238d71063c9db1d84b8ae7c70f1..ffdbe5ef01e07a9b52a859638ebb997afc57036e 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;
@@ -24,20 +45,20 @@ var FileList={
"href": linktarget
});
//split extension from filename for non dirs
- if (type !== 'dir' && name.indexOf('.')!==-1) {
- basename = name.substr(0,name.lastIndexOf('.'));
- extension = name.substr(name.lastIndexOf('.'));
+ if (type != 'dir' && name.indexOf('.')!=-1) {
+ basename=name.substr(0,name.lastIndexOf('.'));
+ extension=name.substr(name.lastIndexOf('.'));
} else {
- basename = name;
- extension = false;
+ basename=name;
+ extension=false;
}
- var name_span = $('<span></span>').addClass('nametext').text(basename);
+ var name_span=$('<span></span>').addClass('nametext').text(basename);
link_elem.append(name_span);
if(extension){
name_span.append($('<span></span>').addClass('extension').text(extension));
}
//dirs can show the number of uploaded files
- if (type === 'dir') {
+ if (type == 'dir') {
link_elem.append($('<span></span>').attr({
'class': 'uploadtext',
'currentUploads': 0
@@ -47,10 +68,10 @@ var FileList={
tr.append(td);
//size column
- if (size!==t('files', 'Pending')) {
+ if(size!=t('files', 'Pending')){
simpleSize = humanFileSize(size);
- } else {
- simpleSize = t('files', 'Pending');
+ }else{
+ simpleSize=t('files', 'Pending');
}
var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
@@ -101,9 +122,9 @@ var FileList={
);
FileList.insertElement(name, 'file', tr);
- if (loading) {
+ if(loading){
tr.data('loading',true);
- } else {
+ }else{
tr.find('td.filename').draggable(dragOptions);
}
if (hidden) {
@@ -134,20 +155,109 @@ var FileList={
FileActions.display(tr.find('td.filename'));
return tr;
},
- refresh:function(data) {
- var result = jQuery.parseJSON(data.responseText);
- if(typeof(result.data.breadcrumb) !== 'undefined'){
- updateBreadcrumb(result.data.breadcrumb);
+ /**
+ * @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'){
+ $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();
+ if($('tr[data-file]').length==0){
+ $('#emptycontent').removeClass('hidden');
}
},
insertElement:function(name,type,element){
@@ -165,19 +275,19 @@ var FileList={
}
}
if(fileElements.length){
- if(pos===-1){
+ if(pos==-1){
$(fileElements[0]).before(element);
}else{
$(fileElements[pos]).after(element);
}
- }else if(type==='dir' && $('tr[data-file]').length>0){
+ }else if(type=='dir' && $('tr[data-file]').length>0){
$('tr[data-file]').first().before(element);
- } else if(type==='file' && $('tr[data-file]').length>0) {
+ } else if(type=='file' && $('tr[data-file]').length>0) {
$('tr[data-file]').last().before(element);
}else{
$('#fileList').append(element);
}
- $('#emptycontent').hide();
+ $('#emptycontent').addClass('hidden');
FileList.updateFileSummary();
},
loadingDone:function(name, id){
@@ -185,7 +295,7 @@ var FileList={
tr.data('loading',false);
mime=tr.data('mime');
tr.attr('data-mime',mime);
- if (id) {
+ if (id != null) {
tr.attr('data-id', id);
}
var path = getPathForPreview(name);
@@ -221,7 +331,7 @@ var FileList={
var newname=input.val();
if (!Files.isFileNameValid(newname)) {
return false;
- } else if (newname !== name) {
+ } else if (newname != name) {
if (FileList.checkName(name, newname, false)) {
newname = name;
} else {
@@ -269,14 +379,14 @@ var FileList={
tr.attr('data-file', newname);
var path = td.children('a.name').attr('href');
td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
- if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
var basename=newname.substr(0,newname.lastIndexOf('.'));
} else {
var basename=newname;
}
td.find('a.name span.nametext').text(basename);
- if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
- if (td.find('a.name span.extension').length === 0 ) {
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+ if (td.find('a.name span.extension').length == 0 ) {
td.find('a.name span.nametext').append('<span class="extension"></span>');
}
td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
@@ -286,7 +396,7 @@ var FileList={
return false;
});
input.keyup(function(event){
- if (event.keyCode === 27) {
+ if (event.keyCode == 27) {
tr.data('renaming',false);
form.remove();
td.children('a.name').show();
@@ -312,7 +422,7 @@ var FileList={
html.attr('data-oldName', oldName);
html.attr('data-newName', newName);
html.attr('data-isNewFile', isNewFile);
- OC.Notification.showHtml(html);
+ OC.Notification.showHtml(html);
return true;
} else {
return false;
@@ -351,13 +461,13 @@ var FileList={
FileList.finishReplace();
};
if (!isNewFile) {
- OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+ OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
}
},
finishReplace:function() {
if (!FileList.replaceCanceled && FileList.replaceOldName && FileList.replaceNewName) {
$.ajax({url: OC.filePath('files', 'ajax', 'rename.php'), async: false, data: { dir: $('#dir').val(), newname: FileList.replaceNewName, file: FileList.replaceOldName }, success: function(result) {
- if (result && result.status === 'success') {
+ if (result && result.status == 'success') {
$('tr').filterAttr('data-replace', 'true').removeAttr('data-replace');
} else {
OC.dialogs.alert(result.data.message, 'Error moving file');
@@ -386,7 +496,7 @@ var FileList={
$.post(OC.filePath('files', 'ajax', 'delete.php'),
{dir:$('#dir').val(),files:fileNames},
function(result){
- if (result.status === 'success') {
+ if (result.status == 'success') {
$.each(files,function(index,file){
var files = $('tr').filterAttr('data-file',file);
files.remove();
@@ -427,7 +537,7 @@ var FileList={
var infoVars = {
dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
files: '</span><span class="fileinfo">'+fileInfo+'</span>'
- };
+ }
var info = t('files', '{dirs} and {files}', infoVars);
@@ -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);
+ }
}
};
@@ -696,16 +831,16 @@ $(document).ready(function(){
FileList.replaceIsNewFile = null;
}
FileList.lastAction = null;
- OC.Notification.hide();
+ OC.Notification.hide();
});
$('#notification:first-child').on('click', '.replace', function() {
- OC.Notification.hide(function() {
- FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
- });
+ OC.Notification.hide(function() {
+ FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
+ });
});
$('#notification:first-child').on('click', '.suggest', function() {
$('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show();
- OC.Notification.hide();
+ OC.Notification.hide();
});
$('#notification:first-child').on('click', '.cancel', function() {
if ($('#notification > span').attr('data-isNewFile')) {
@@ -723,5 +858,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 4a6c9c7890053c2c786f302ae568f279625702fe..afbb14c5e004993ecc200bcce186790da7135df1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -1,6 +1,6 @@
Files={
updateMaxUploadFilesize:function(response) {
- if(response === undefined) {
+ if(response == undefined) {
return;
}
if(response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
@@ -9,7 +9,7 @@ Files={
$('#usedSpacePercent').val(response.data.usedSpacePercent);
Files.displayStorageWarnings();
}
- if(response[0] === undefined) {
+ if(response[0] == undefined) {
return;
}
if(response[0].uploadMaxFilesize !== undefined) {
@@ -25,7 +25,7 @@ Files={
OC.Notification.show(t('files', '\'.\' is an invalid file name.'));
return false;
}
- if (name.length === 0) {
+ if (name.length == 0) {
OC.Notification.show(t('files', 'File name cannot be empty.'));
return false;
}
@@ -33,7 +33,7 @@ Files={
// check for invalid characters
var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
for (var i = 0; i < invalid_characters.length; i++) {
- if (name.indexOf(invalid_characters[i]) !== -1) {
+ if (name.indexOf(invalid_characters[i]) != -1) {
OC.Notification.show(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
return false;
}
@@ -67,29 +67,106 @@ Files={
OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
return;
}
+ },
+
+ setupDragAndDrop: function(){
+ var $fileList = $('#fileList');
+
+ //drag/drop of files
+ $fileList.find('tr td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
+ $(e).draggable(dragOptions);
+ }
+ });
+
+ $fileList.find('tr[data-type="dir"] td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
+ $(e).droppable(folderDropOptions);
+ }
+ });
+ },
+
+ lastWidth: 0,
+
+ initBreadCrumbs: function () {
+ Files.lastWidth = 0;
+ Files.breadcrumbs = [];
+
+ // initialize with some extra space
+ Files.breadcrumbsWidth = 64;
+ if ( document.getElementById("navigation") ) {
+ Files.breadcrumbsWidth += $('#navigation').get(0).offsetWidth;
+ }
+ Files.hiddenBreadcrumbs = 0;
+
+ $.each($('.crumb'), function(index, breadcrumb) {
+ Files.breadcrumbs[index] = breadcrumb;
+ Files.breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
+ });
+
+ $.each($('#controls .actions>div'), function(index, action) {
+ Files.breadcrumbsWidth += $(action).get(0).offsetWidth;
+ });
+
+ // event handlers for breadcrumb items
+ $('#controls .crumb a').on('click', onClickBreadcrumb);
+ },
+
+ resizeBreadcrumbs: function (width, firstRun) {
+ if (width != Files.lastWidth) {
+ if ((width < Files.lastWidth || firstRun) && width < Files.breadcrumbsWidth) {
+ if (Files.hiddenBreadcrumbs == 0) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('a').hide();
+ $(Files.breadcrumbs[1]).append('<span>...</span>');
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ Files.hiddenBreadcrumbs = 2;
+ }
+ var i = Files.hiddenBreadcrumbs;
+ while (width < Files.breadcrumbsWidth && i > 1 && i < Files.breadcrumbs.length - 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ Files.hiddenBreadcrumbs = i;
+ i++
+ }
+ } else if (width > Files.lastWidth && Files.hiddenBreadcrumbs > 0) {
+ var i = Files.hiddenBreadcrumbs;
+ while (width > Files.breadcrumbsWidth && i > 0) {
+ if (Files.hiddenBreadcrumbs == 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('span').remove();
+ $(Files.breadcrumbs[1]).find('a').show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ } else {
+ $(Files.breadcrumbs[i]).show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ if (Files.breadcrumbsWidth > width) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ break;
+ }
+ }
+ i--;
+ Files.hiddenBreadcrumbs = i;
+ }
+ }
+ Files.lastWidth = width;
+ }
}
};
$(document).ready(function() {
+ // FIXME: workaround for trashbin app
+ if (window.trashBinApp){
+ return;
+ }
Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);
- $('#fileList tr').each(function(){
- //little hack to set unescape filenames in attribute
- $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
- });
+
+ FileList.postProcessList();
+ Files.setupDragAndDrop();
$('#file_action_panel').attr('activeAction', false);
- //drag/drop of files
- $('#fileList tr td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
- $(e).draggable(dragOptions);
- }
- });
- $('#fileList tr[data-type="dir"] td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
- $(e).droppable(folderDropOptions);
- }
- });
$('div.crumb:not(.last)').droppable(crumbDropOptions);
$('ul#apps>li:first-child').data('dir','');
if($('div.crumb').length){
@@ -127,7 +204,7 @@ $(document).ready(function() {
var rows = $(this).parent().parent().parent().children('tr');
for (var i = start; i < end; i++) {
$(rows).each(function(index) {
- if (index === i) {
+ if (index == i) {
var checkbox = $(this).children().children('input:checkbox');
$(checkbox).attr('checked', 'checked');
$(checkbox).parent().parent().addClass('selected');
@@ -145,7 +222,7 @@ $(document).ready(function() {
$(checkbox).attr('checked', 'checked');
$(checkbox).parent().parent().toggleClass('selected');
var selectedCount=$('td.filename input:checkbox:checked').length;
- if (selectedCount === $('td.filename input:checkbox').length) {
+ if (selectedCount == $('td.filename input:checkbox').length) {
$('#select_all').attr('checked', 'checked');
}
}
@@ -192,7 +269,7 @@ $(document).ready(function() {
var rows = $(this).parent().parent().parent().children('tr');
for (var i = start; i < end; i++) {
$(rows).each(function(index) {
- if (index === i) {
+ if (index == i) {
var checkbox = $(this).children().children('input:checkbox');
$(checkbox).attr('checked', 'checked');
$(checkbox).parent().parent().addClass('selected');
@@ -205,7 +282,7 @@ $(document).ready(function() {
if(!$(this).attr('checked')){
$('#select_all').attr('checked',false);
}else{
- if(selectedCount === $('td.filename input:checkbox').length){
+ if(selectedCount==$('td.filename input:checkbox').length){
$('#select_all').attr('checked',true);
}
}
@@ -242,72 +319,15 @@ $(document).ready(function() {
//do a background scan if needed
scanFiles();
- var lastWidth = 0;
- var breadcrumbs = [];
- var breadcrumbsWidth = 0;
- if ( document.getElementById("navigation") ) {
- breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
- }
- var hiddenBreadcrumbs = 0;
-
- $.each($('.crumb'), function(index, breadcrumb) {
- breadcrumbs[index] = breadcrumb;
- breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
- });
-
-
- $.each($('#controls .actions>div'), function(index, action) {
- breadcrumbsWidth += $(action).get(0).offsetWidth;
- });
-
- function resizeBreadcrumbs(firstRun) {
- var width = $(this).width();
- if (width !== lastWidth) {
- if ((width < lastWidth || firstRun) && width < breadcrumbsWidth) {
- if (hiddenBreadcrumbs === 0) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('a').hide();
- $(breadcrumbs[1]).append('<span>...</span>');
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- hiddenBreadcrumbs = 2;
- }
- var i = hiddenBreadcrumbs;
- while (width < breadcrumbsWidth && i > 1 && i < breadcrumbs.length - 1) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- hiddenBreadcrumbs = i;
- i++;
- }
- } else if (width > lastWidth && hiddenBreadcrumbs > 0) {
- var i = hiddenBreadcrumbs;
- while (width > breadcrumbsWidth && i > 0) {
- if (hiddenBreadcrumbs === 1) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('span').remove();
- $(breadcrumbs[1]).find('a').show();
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- } else {
- $(breadcrumbs[i]).show();
- breadcrumbsWidth += $(breadcrumbs[i]).get(0).offsetWidth;
- if (breadcrumbsWidth > width) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- break;
- }
- }
- i--;
- hiddenBreadcrumbs = i;
- }
- }
- lastWidth = width;
- }
- }
+ Files.initBreadCrumbs();
$(window).resize(function() {
- resizeBreadcrumbs(false);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, false);
});
- resizeBreadcrumbs(true);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, true);
// display storage warnings
setTimeout ( "Files.displayStorageWarnings()", 100 );
@@ -382,17 +402,13 @@ scanFiles.scanning=false;
function boolOperationFinished(data, callback) {
result = jQuery.parseJSON(data.responseText);
Files.updateMaxUploadFilesize(result);
- if(result.status === 'success'){
+ if(result.status == 'success'){
callback.call();
} else {
alert(result.data.message);
}
}
-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');
@@ -436,7 +452,7 @@ var createDragShadow = function(event){
});
return dragshadow;
-};
+}
//options for file drag/drop
var dragOptions={
@@ -446,7 +462,7 @@ var dragOptions={
stop: function(event, ui) {
$('#fileList tr td.filename').addClass('ui-draggable');
}
-};
+}
// sane browsers support using the distance option
if ( $('html.ie').length === 0) {
dragOptions['distance'] = 20;
@@ -489,7 +505,7 @@ var folderDropOptions={
});
},
tolerance: 'pointer'
-};
+}
var crumbDropOptions={
drop: function( event, ui ) {
@@ -655,3 +671,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/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/lib/helper.php b/apps/files/lib/helper.php
index 7135ef9f656525fbc18b3fd7c87b95873ce481a2..3c13b8ea6e2509b2fe6b6b1e1766d7a007b28648 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'] = \OCP\Preview::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/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/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/util.php b/apps/files_encryption/lib/util.php
index cd4db05fb9bb08919f7f3bec454738270cb85716..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;
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 ac121fd08e29c4f7cbf1d4c6adee6d0f23e1e392..67320b1cdb690878d77eb9c408edbade129b70f9 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -7,8 +7,6 @@ function fileDownloadPath(dir, file) {
return url;
}
-var form_data;
-
$(document).ready(function() {
$('#data-upload-form').tipsy({gravity:'ne', fade:true});
@@ -50,17 +48,18 @@ $(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(function() {
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_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/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..6d3a07a9d0b0ac07b0207a6d22b28d490ef11f7a 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;
@@ -176,6 +191,7 @@ if (isset($path)) {
}
$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/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/lib/helper.php b/apps/files_trashbin/lib/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..098fc0b54b7f9f61d246b48717b52051d579a2a4
--- /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'] = \OCP\Preview::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/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/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/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_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/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 0266599d21d385eac72f04ebbcdbd4fcd7a352fc..f1836fd4727f7d09d8ed5c97e80d4d0f62d93149 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,10 +39,8 @@
return;
}
// Escape
- if(event.keyCode === 27 && self.options.closeOnEscape) {
- if (self.closeCB) {
- self.closeCB();
- }
+ if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+ event.stopImmediatePropagation();
self.close();
return false;
}
@@ -86,27 +84,25 @@
var self = this;
switch(key) {
case 'title':
- var $title = $('<h3 class="oc-dialog-title">' + this.options.title
- + '</h3>'); //<hr class="oc-dialog-separator" />');
if(this.$title) {
- this.$title.replaceWith($title);
+ this.$title.text(value);
} else {
+ var $title = $('<h3 class="oc-dialog-title">'
+ + value
+ + '</h3>');
this.$title = $title.prependTo(this.$dialog);
}
this._setSizes();
break;
case 'buttons':
- var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
if(this.$buttonrow) {
- this.$buttonrow.replaceWith($buttonrow);
+ this.$buttonrow.empty();
} else {
+ var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
this.$buttonrow = $buttonrow.appendTo(this.$dialog);
}
$.each(value, function(idx, val) {
var $button = $('<button>').text(val.text);
- if (val.classes) {
- $button.addClass(val.classes);
- }
if(val.defaultButton) {
$button.addClass('primary');
self.$defaultButton = $button;
@@ -130,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 dc293f949c18aac4b7cd05b214765b1037a34a49..28bd94b9b0f632cadba6861505bdcdd46426aa43 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 message template'));
+ .fail(function(status, error) {
+ // If the method is called while navigating away from
+ // the page, we still want to deliver the message.
+ if(status === 0) {
+ alert(title + ': ' + content);
+ } else {
+ alert(t('core', 'Error loading message template: {error}', {error: error}));
+ }
});
},
_fileexistsshown: false,
@@ -454,8 +464,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);
@@ -470,8 +480,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);
@@ -495,9 +505,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) {
@@ -536,11 +553,7 @@ var OCdialogs = {
filename: entry.name,
date: OC.mtime2date(entry.mtime)
});
- if (entry.mimetype === "httpd/unix-directory") {
- $li.find('img').attr('src', OC.imagePath('core', 'filetypes/folder.png'));
- } else {
- $li.find('img').attr('src', OC.Router.generate('core_ajax_preview', {x:32, y:32, file:escapeHTML(dir+'/'+entry.name)}) );
- }
+ $li.find('img').attr('src', entry.mimetype_icon);
self.$filelist.append($li);
});
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/ca.php b/core/l10n/ca.php
index 769734901256808cd38dc393d6fb30e55f903399..c86af43ada64d1759c0d809ad1560ece76a7fdfb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -48,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 9e34e6f4ac3ffbf98e8383fcac4081b7c5b0fef2..a38050bccc2016f3eb6b52805a5e6a20f860299d 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "el año pasado",
"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",
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/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 6d34d6e23c326baed17a70eb3b9989e9ee897605..86c46471a1413412778722ed0c971bfd986df751 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"last year" => "i fjor",
"years ago" => "Ã¥r sidan",
"Choose" => "Vel",
-"Error loading file picker template" => "Klarte ikkje å lasta filveljarmalen",
"Yes" => "Ja",
"No" => "Nei",
"Ok" => "Greitt",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 2162de0e48c4ce405cf742437f6c53453e1b52fb..deb4b4c81c813b43459513be889710071618004b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"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",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 7b1c7b3702c20a87eea8c27391c80d0dfdf1734d..f758c0e9bc36a40e128954d4df36f41363e6ba61 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"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 7f4e34cb555a99afe9daa48ec73cc75fd97c871c..4554b64d4054f80feb7cff996747c04f865efa81 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
"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?",
@@ -46,7 +48,6 @@ $TRANSLATIONS = array(
"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",
@@ -88,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 6eaa909cad1e41bdf139a2eb52ebed1fadc08a39..c8462573ffa0f7b613c43b9d048eefbe62b82b27 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
"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",
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 267e07189c74967619ac889c1dd8d94646a2d4e2..a4c80638d82bdaacd33b5f9994eeb987ec4bf64c 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -48,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/routes.php b/core/routes.php
index d8c2d03236f4864b436b13d61c037c0d2417bcf7..57e25c0f1f7371576aeeece169f8225941b2d116 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -57,6 +57,23 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{
->post()
->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}')
->requirements(array('file' => '.*.css'))
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/l10n/ach/core.po b/l10n/ach/core.po
index b6ac1f4c9ac6226c54b53a4183b204d79a4157a5..f61d3994eea526a6a7a49ea25ed308ac04c71212 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+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: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/ach/lib.po b/l10n/ach/lib.po
index f5999b79cfc66ee80f6a896657c8d19d6849e5ca..efa6747b0fb17c06e3b730b49f090a382bfd0d76 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: 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"
+"POT-Creation-Date: 2013-09-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"
@@ -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 ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index 82c551ea623d4eb5cd940b85f73c58b9fa91f76d..391035008ee3f35e4348441a1cee7b1cda2d9d90 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+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: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\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 ""
@@ -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/af_ZA/core.po b/l10n/af_ZA/core.po
index cb6d7ff9058b61ed3ee4062e9b4e9645a8bc7aa6..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/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 4418949ce77386b21aad0c2f3ed85772e650fb1b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/ar/core.po b/l10n/ar/core.po
index 11ca9dc519d0f068977e452038c0688b17d21a1e..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "اليوم"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:831
+#: 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 "تم ارسال البريد الالكتروني"
@@ -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 7f7187cc9a9d3b21ae829a2d1f51fde80833a1b9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 8bf50316cd11430a5b1630ad7dce34da3402a0a1..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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/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 e3aca2c27918a6dc923464653b5d624a9aa9ee2b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "преди Ñекунди"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "днеÑ"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "поÑледниÑÑ‚ меÑец"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "поÑледната година"
-#: js/js.js:831
+#: 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 ""
@@ -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 a2c0ad5b1cff89ff0b26742430f87d413779c5b7..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 d812f5bc43864eb277da8143d320a6ec6fab42c9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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/bn_BD/core.po b/l10n/bn_BD/core.po
index 5df89ca1ab2f1db50dc85a371bc267fbf38a2763..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "সেকেনà§à¦¡ পূরà§à¦¬à§‡"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "আজ"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "মাস পূরà§à¦¬à§‡"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:831
+#: 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 "ই-মেইল পাঠানো হয়েছে"
@@ -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 1b5320391c2c4e0c11f05f526fe25b49b9d6254d..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 7a18b1022de86cb8665205ebea5754ef56457971..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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/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 2820609d21b97f33ebbbc841a509f6d977941901..900c6cb8f00387e7c56a12a98954ce134b07b8df 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+0000\n"
-"Last-Translator: rogerc\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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "avui"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:831
+#: 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"
@@ -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 9dc1d5ffcc6b0002c03a2fdcd407bc366665211d..ca6a5240892c10680eab318bbbc6aa0c5609ac64 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-05 07: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: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 167cc378c2acb8b77562feb203b019abc1fca923..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 faccbe5a7fcb14a225f1d0784d973de333db4fd3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -130,11 +130,15 @@ msgstr "Actualitza"
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/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 0de2ab11c3c18ad89081272b48dab3d51e9f80a0..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "dnes"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "minulý mÄ›sÃc"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "pÅ™ed mÄ›sÃci"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:831
+#: 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"
@@ -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 bf3385990f8fad263abddf76c8e4bd05ca67130f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 e8940210d9da035370231a86b107b83cabda050b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/cy_GB/core.po b/l10n/cy_GB/core.po
index a7bf69ccd3e3823beb6d79af982af07dbb6c4c9c..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "heddiw"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:831
+#: 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"
@@ -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 7da44b1cba3a647a8fb8838d92ee1deefd8b1afe..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 4b727d0b47ab1162d765db881e04f234beef06d1..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "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/da/core.po b/l10n/da/core.po
index 6f779974c066aea79041e8234fe9fa7131d52dad..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "sidste år"
-#: js/js.js:831
+#: 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"
@@ -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 5af73cd665ecb259de1a6cad1ea8578739374e6a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 806a43bd2b72d223e8f7f6297619f5b38acea5a9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -131,11 +131,15 @@ msgstr "Opdater"
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/de/core.po b/l10n/de/core.po
index 6138d2307b5256510fd57a19d8ea3e0b111f9b2c..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:831
+#: 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"
@@ -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 188630a91ce7923138c0c62423e6412e15ca82f0..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 1522bb9a70f35f64f983c6cc43a13d2ac36ccd14..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-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"
+"POT-Creation-Date: 2013-09-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_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 a91e8478db85e479db22860ed5b1b5368921d93d..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:831
+#: 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"
@@ -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 c6ac05470885f51632ca40c253d80d60268a6a2c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 f8e41f3357aa89e65776b3d582b819c13c54d209..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -136,11 +136,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ü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_DE/core.po b/l10n/de_DE/core.po
index ec4b27fe36cb9335cbf2b0e2239a6b58973ed0cb..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "Heute"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:831
+#: 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"
@@ -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 9d306a5899b752e33973e72d0ce4293fbfc512d9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 e417ee0bd68d215fe37322e9747946768effa38a..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-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"
+"POT-Creation-Date: 2013-09-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/el/core.po b/l10n/el/core.po
index a4bcc5d67c79d1115e3d9b9edc87ae6bffdbe1df..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "δευτεÏόλεπτα Ï€Ïιν"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "σήμεÏα"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "μήνες Ï€Ïιν"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "τελευταίο χÏόνο"
-#: js/js.js:831
+#: 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 απεστάλη "
@@ -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 4435befcebf7f446fbce459e48dbb72749f3b8b4..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 c02526fbe00880bfa1eb5d9e10b26f6b91b0ccf2..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -134,11 +134,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 "Γίνεται αποθήκευση..."
@@ -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/en@pirate/core.po b/l10n/en@pirate/core.po
index e87a1af40e5b967cdcea548a39b2b4b8ef01cfb7..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/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 abcc7173b5162f45fa94c3471e3eecc3bd8a6ec2..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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_GB/core.po b/l10n/en_GB/core.po
index a1ed07591e21dd20be2a81104d0460c5f48405fd..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "today"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "last month"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "months ago"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "last year"
-#: js/js.js:831
+#: 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"
@@ -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 e77bb9c6100c803894abce882755f16a38cc7b8b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 80f13d406707b58bb49f59283f00f4324c5f63d2..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/eo/core.po b/l10n/eo/core.po
index 3b30cee81814061618b2a26152892d7d3b60edd8..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundoj antaÅe"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hodiaÅ"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "hieraÅ"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "monatoj antaÅe"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "lastajare"
-#: js/js.js:831
+#: 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"
@@ -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 3da45d867e4b6b53bc3dc83fbc5966e75b9084de..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 829bdd3e1163ec9ed0f1743a8f0e864e1175d9b3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -128,11 +128,15 @@ msgstr "Äœisdatigi"
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/es/core.po b/l10n/es/core.po
index 5939a1c04f726d267da6ddaa9d26f99f069fe1e4..8b73e83c2053392605ab39eb10940756698451d7 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-09-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"
@@ -100,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"
@@ -176,59 +196,59 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hoy"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
msgstr[1] "Hace %n dÃas"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:831
+#: js/js.js:863
msgid "years ago"
msgstr "años antes"
@@ -236,22 +256,26 @@ msgstr "años antes"
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."
@@ -261,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"
@@ -281,7 +305,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"
@@ -337,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"
@@ -481,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"
@@ -610,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"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 5f5825ab799d32e3d3a43c61ffd4f0cf3957abc5..e68841cb875646b54c04c956c6d464b36aaddb56 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-03 18:10+0000\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"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 7fa3515a0609532a08530c26aceb1561b31f7e58..26442ede404f6f510c24a04d2ce0a722917e6b31 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\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"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index d1b498f5a0b3c672acbce40ad3f9ca7fa0e25401..319d9f9f13be6dd00912e7ea0f14cc68333d8924 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 18:41+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-09-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"
@@ -52,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"
@@ -109,37 +121,37 @@ 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 "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 "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 "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 7dd98054072d9fc703ece2c2a3e7d2b53d92bd65..32d2de1aad91fec66804e7f99d647b9e97d1978d 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -136,11 +136,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 archivos... Espere por favor, esto puede llevar algo de tiempo."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Guardando..."
@@ -156,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"
@@ -185,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"
@@ -351,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 "
@@ -422,7 +426,7 @@ msgstr "Mostrar asistente para iniciar de nuevo"
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"
@@ -446,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"
@@ -462,38 +466,66 @@ 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ú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 "La aplicación de cifrado no está activada, descifre sus archivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Contraseña de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Descifrar archivos"
@@ -519,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_AR/core.po b/l10n/es_AR/core.po
index be8c46730fcdacc32a4bb3572c3643ab345eb847..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "hoy"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:831
+#: 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"
@@ -406,7 +430,7 @@ msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
#: 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 511d60fc1049bc1e96967fcbf4f8ee2ef05ee856..68680594d1868f332d8c1aab648977bcaf48cd81 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 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: cnngimenez\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 9bdc2244b46c2409783ca53b96782b0192b24e85..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-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
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 77b82de7814500b3824c9d729224b9ebd65e42a1..e91cf0d7808c484422ba982372190cf4351ee3d0 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-06 20:00+0000\n"
-"Last-Translator: cnngimenez\n"
+"POT-Creation-Date: 2013-09-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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -131,11 +131,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 "Desencriptando archivos... Por favor espere, esto puede tardar."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Guardando..."
@@ -151,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"
@@ -180,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)"
@@ -346,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 "
@@ -417,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"
@@ -441,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"
@@ -457,38 +461,66 @@ 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 "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 "Clave de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Desencriptar todos los archivos"
@@ -514,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 e260f9f562cbf2bed6df63fef9ac926ac3e53e5f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-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_MX/core.po b/l10n/es_MX/core.po
index 737f1b2a718a9769a6b58386dec6a4944aa434a4..9a6e9cbb0958352f290f5f24a2338382c4f801b8 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+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 (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/es_MX/lib.po b/l10n/es_MX/lib.po
index 89354b5767a1b0c6b09db80c35ed7e1d2f380e39..7861d1b48366b8a0854741acd721ee82601adc93 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: 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"
+"POT-Creation-Date: 2013-09-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"
@@ -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 ""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 312c3c05b4bdedb12f1b97f6f3616cac2d2c0002..e4d80e5f68314614bbaf3c9763dce75daca3dc1e 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+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 (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\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 ""
@@ -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/et_EE/core.po b/l10n/et_EE/core.po
index fdfe37bfc2ee814bd00e9d69eb1e06a332e3180e..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "täna"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "eile"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:831
+#: 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"
@@ -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 de1769914cc9d8b2c4c7056655a4b84f774afa79..943c2186c0caf433528600d07e894f60b4a70a53 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-04 05: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: 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/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 73328253ec550cee4a0dcb6f835cfb6bebc9d2ba..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 5b7ce1cef05706cf33aabcda6e1b01a0f8760b23..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-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"
+"POT-Creation-Date: 2013-09-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"
@@ -130,11 +130,15 @@ msgstr "Uuenda"
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/eu/core.po b/l10n/eu/core.po
index 07627d19b1bbe4f819717aec58148ac40871d8fe..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "gaur"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:831
+#: 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"
@@ -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 433b86d0b54f002810f15619fdd15a4b4ce78d05..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 9d8997f6f9dfd355483b2179b93251f5611f7f2e..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -130,11 +130,15 @@ msgstr "Eguneratu"
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/fa/core.po b/l10n/fa/core.po
index 7270da2b1c159cbb95ef52e0a86683403040309d..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "امروز"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "ماه‌های قبل"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:831
+#: 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 "ایمیل ارسال شد"
@@ -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 b14ebbf89dfe7d1a0ea1dcb8691cd5cbef99c4b3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 70df68704d24eeae3beb71a8d5fb35f36ce72709..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "استÙاده ابن آدرس <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/fi_FI/core.po b/l10n/fi_FI/core.po
index 26e5f4c8578013cbf3d412b7c08e5e48a67910b5..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "tänään"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:831
+#: 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"
@@ -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_sharing.po b/l10n/fi_FI/files_sharing.po
index 31b531d8cf132c1eb416cadbb1c5b8f5bfe6828b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 78daad02a6e0f80856e5962d69a48cd605134686..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -129,11 +129,15 @@ msgstr "Päivitä"
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/fr/core.po b/l10n/fr/core.po
index b36056d3db6edb003039c3c90656cb6bb9ecf059..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "hier"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:831
+#: 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é"
@@ -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 f02613e51df469f8f9e38426d0293030463c085e..f3e3767ce8b2aae20738ce071c098da6f5bb0254 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-06 15: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: 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"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 581738c45f6965945c9163ac8da639a1fa459779..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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 376d8982c168d925f599202c7af788a07bbdd352..547f24c023034e544fb3c0bb222c48a8d16a2ddb 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-03 12: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"
@@ -50,11 +50,23 @@ 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
msgid "web services under your control"
msgstr "services web sous votre contrôle"
@@ -107,37 +119,37 @@ msgstr "Les archives de type %s ne sont pas supportées"
msgid "Failed to open archive when installing app"
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 "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 "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 "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 "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 "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 "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 "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index bbb0ba9335f4fa9c44c7e42622d563131c73b61c..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/gl/core.po b/l10n/gl/core.po
index 953c2500a16e4e310c129723aa721fc813fd81af..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "hoxe"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "onte"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "último mes"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "último ano"
-#: js/js.js:831
+#: 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"
@@ -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 3a9323639d0eaccc1fdde26e77ba794a32bc26ac..f1ef8190bbcf80c83a7736ffd4c815d13874c03a 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-03 12: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: 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/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 1d3d82f4111bdd8c7b97c9e17f9d2b311ee577cc..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 4ae06757f52d304260a4c3b5348b1d8b1b454166..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/he/core.po b/l10n/he/core.po
index b129f093b4531b15126550bc852251afdbad9d0f..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "×©× ×™×•×ª"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "×œ×¤× ×™ %n דקה"
msgstr[1] "×œ×¤× ×™ %n דקות"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "×œ×¤× ×™ %n שעה"
msgstr[1] "×œ×¤× ×™ %n שעות"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "היו×"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "×תמול"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "×œ×¤× ×™ %n יו×"
msgstr[1] "×œ×¤× ×™ %n ימי×"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "×œ×¤× ×™ %n חודש"
msgstr[1] "×œ×¤× ×™ %n חודשי×"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "חודשי×"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "×©× ×” שעברה"
-#: js/js.js:831
+#: 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 "הודעת הדו×״ל × ×©×œ×—×”"
@@ -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 c7274f6691f1e4918ec69ce559876b897eb42e56..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 a4c9254b6aa0a628fbe14c7a7995cdef5f5744cb..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "עברית"
@@ -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/hi/core.po b/l10n/hi/core.po
index 86ffaca9ab665e2d8b9fbb664ec91c5438aa6a4b..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 "ईमेल à¤à¥‡à¤œ दिया गया है "
@@ -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/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 21d4d87892bc9796067280676fdb418dcb37d4c0..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/hr/core.po b/l10n/hr/core.po
index 5a976319906684f491651db9b73c7f9faff5ea56..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "danas"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "juÄer"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:831
+#: 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 ""
@@ -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 5d9fd41cb78f9822c82f4eaca15f966c4c0cf129..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 7837d0febac83989b8352a0d05c765ab292f1326..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "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/hu_HU/core.po b/l10n/hu_HU/core.po
index 871561f5daa54f171df1d826921377813bed0207..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "ma"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "tavaly"
-#: js/js.js:831
+#: 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"
@@ -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 9e79db98f6849b8cae16015fb615b146a9f2e984..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 52e0ec6ab15b0de472b2d4413b9c621c427534f1..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -131,11 +131,15 @@ msgstr "FrissÃtés"
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/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 bf61a23d0d45dc89f0b31dcf16e9ee8f43cd726f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 279865aadcc8e26c631b275621cdf311ccfc5415..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 465b88cf01080cb8ffd42eebaed25633da2293ca..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -128,11 +128,15 @@ msgstr "Actualisar"
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/id/core.po b/l10n/id/core.po
index 1c17fc9a1de1ee2777b8d528b20d485c867ab723..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hari ini"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:831
+#: 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"
@@ -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 e33e3ae08f7a7fc6f64dbb691b60bb5537136a82..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 33c557825d59c12dc7a3c60902ad28d4bd8c21ed..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -128,11 +128,15 @@ msgstr "Perbarui"
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/is/core.po b/l10n/is/core.po
index a4202c883c6666b8b58d9017167923bd48b9d93c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "Ã dag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "à gær"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "sÃðasta mánuði"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "mánuðir sÃðan"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "sÃðasta ári"
-#: js/js.js:831
+#: 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"
@@ -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 836b3e5bb603317b15a061464b719b2606867120..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 52e3e20debc9595849437c8955cf90a5a785f241..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -129,11 +129,15 @@ msgstr "Uppfæra"
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/it/core.po b/l10n/it/core.po
index a1df98badc5faa795d5c672af50fbac2e4464b82..10f3e72f5d7a00e7728ce2d2c479cf2ad9dd47f9 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:52+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: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"
"Content-Type: text/plain; charset=UTF-8\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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "oggi"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:831
+#: 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"
@@ -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 33452f2b84ef7176c76330f8877a1017faff97d3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 8796242725ad7cea3bb34d3d7a1f1ad7e21d04a1..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/ja_JP/core.po b/l10n/ja_JP/core.po
index 913bf45fdcca43b6fa41e1cf2237d2b8911d48e9..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "数秒å‰"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分å‰"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間後"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "今日"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 日後"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "一月å‰"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n カ月後"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "月å‰"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "一年å‰"
-#: js/js.js:831
+#: 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 "メールをé€ä¿¡ã—ã¾ã—ãŸ"
@@ -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 0fea02f11c3863745148f11ede76ed41152e27e3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index a8475ee8c22e5abd84b2d7c570de466fba06a5f5..c910ea9099386bf8072c93865df270a2f2dfd673 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 15:30+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: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"
@@ -51,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 "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス"
@@ -108,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 "éž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 e42d2b3c7629d889b7ff0cf2e3ecf8715a78b466..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/ka/core.po b/l10n/ka/core.po
index f567d8ac98efa24d6c726c78ef081ac52ff3cee3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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 (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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "დღეს"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/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 a3a8d3eba3a9146716aabb3dca3322a63f9fefe0..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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_GE/core.po b/l10n/ka_GE/core.po
index 66d5a94e1c3c528098fc37aa68281e705af67996..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "დღეს"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "გáƒáƒ¡áƒ£áƒš თვეში"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "ბáƒáƒšáƒ წელს"
-#: js/js.js:831
+#: 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 "იმეილი გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ"
@@ -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 febee9664fc10f11a538a8e75289eafb5bb5f198..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 7ac981147719f6cddfa37354f4cd3c2f21174df3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
-#: 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/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 73bf91520633fa8a6bcabb0b4212567d6dcb1cb3..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "ì´ˆ ì „"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 ì „ "
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 ì „ "
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "오늘"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ì–´ì œ"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%nì¼ ì „ "
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "지난 달"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 ì „ "
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "개월 ì „"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "ìž‘ë…„"
-#: js/js.js:831
+#: 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 "ì´ë©”ì¼ ë°œì†¡ë¨"
@@ -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 fcbb87f743ce6ab65c0bde12fcf43fa542003c4a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 5836e16abbb83e523e13e30d260aaf26cd01235e..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "í•œêµì–´"
@@ -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/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 65ffe9e63c88bdd1c59693f71afdb5f749a454ef..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 1171bd5e1aee3921f23629fd1b83b95317e6b3b3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 9872d23429c3fdad34d7c241fff6ae16ac24a8e6..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-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 19: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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\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 ""
@@ -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/lb/core.po b/l10n/lb/core.po
index 7e63c68833dc029d1b1dff0fcdefe3e91968d044..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "haut"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:831
+#: 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"
@@ -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 29fcd6c34e96210570a72562d32db6ffdffd2459..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 ac7677e18754c2071e2048eeb78cb1fb84f037c5..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "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/lt_LT/core.po b/l10n/lt_LT/core.po
index e8292e89ce8b40f08bce64c7be25211aee4f1f5f..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "Å¡iandien"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:831
+#: 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"
@@ -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 217b1dcfb16b5e389c74c93827989021908e8930..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-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
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 b60503e50a554485e98cdbff2b0ae04188dedf7a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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
@@ -103,11 +106,11 @@ msgstr "Prašome palaukti..."
#: 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:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Klaida įjungiant programą"
#: js/apps.js:123
msgid "Updating...."
@@ -129,11 +132,15 @@ msgstr "Atnaujinti"
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 a9962fc3311ca2908b9b50db3dd81ad3e801e4c9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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 7c87f637dda194eb2b14d4a21cf8a2feed7cfbc2..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "Å¡odien"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "gÄjuÅ¡ajÄ gadÄ"
-#: js/js.js:831
+#: 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"
@@ -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 8c5c1f014161a32cfdbcd1d6eaa6c4ed65a2a511..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 c27ebcce6d0a995223d56192512b3559699329a3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -129,11 +129,15 @@ msgstr "AtjauninÄt"
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/mk/core.po b/l10n/mk/core.po
index 14d322295f3b3d005147b5478021d9359b59ad88..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "пред Ñекунди"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "денеÑка"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "минатиот меÑец"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "пред меÑеци"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "минатата година"
-#: js/js.js:831
+#: 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 "Е-порака пратена"
@@ -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 0ae038b02ec8c94c5c0d5411091e40b325fbe573..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 40f07233530059f2d4fed52e30d34c3f4653f0ca..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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/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 b7322371c619eeaa9f6a4a069390471f7d735eff..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 936e15a9ccfbfed6d4f8225f4beba34147ad34df..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 0efc0a627d846ea28a2090b8401ba6e7fa43faa1..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -128,11 +128,15 @@ msgstr "Kemaskini"
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/my_MM/core.po b/l10n/my_MM/core.po
index 6110b1cecb2cef6f5f53ea592b6c8bd38f85de6a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "ပြီးá€á€²á€·á€žá€±á€¬á€œ"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:831
+#: 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 ""
@@ -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/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 5eefdc2e422554759f0ee4b17b2545c8084d62cc..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/nb_NO/core.po b/l10n/nb_NO/core.po
index 5a8f8a24b8585b91d1bd501780e7f98920811c67..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "forrige år"
-#: js/js.js:831
+#: 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"
@@ -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 60ad1adffc25585f3e44808bf4887c0867626074..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 a3f2e936037b2532217f7c2c8fb54706715d172c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -130,11 +130,15 @@ msgstr "Oppdater"
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/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 bbb049169c7ba602bb22965f8021720209f01d7a..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "vandaag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:831
+#: 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"
@@ -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 ab4c2589429cf1ef836aa7b1373366f4581d6bbd..e8546df4ad2db31a45b1f77bb325fdfbebd74abf 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-06 20: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: 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/nl/files_sharing.po b/l10n/nl/files_sharing.po
index fd82bdc9534c8777a8f810f3d94e44448ec92994..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 eda06bc1e279208b1f68db04f3c6cdf9eb34d29c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -132,11 +132,15 @@ msgstr "Bijwerken"
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/nn_NO/core.po b/l10n/nn_NO/core.po
index 61b157dad1d95ae11f522269ec278d2189ed489c..87a27da4b851c0367f9b2cf410b0723988b1cfb1 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-08 21:36-0400\n"
-"PO-Revision-Date: 2013-09-08 16:30+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -93,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"
@@ -169,59 +189,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt sidan"
msgstr[1] "%n minutt sidan"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time sidan"
msgstr[1] "%n timar sidan"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sidan"
msgstr[1] "%n dagar sidan"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "førre månad"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sidan"
msgstr[1] "%n månadar sidan"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "i fjor"
-#: js/js.js:831
+#: js/js.js:863
msgid "years ago"
msgstr "Ã¥r sidan"
@@ -229,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"
-msgstr "Klarte ikkje å lasta filveljarmalen"
+#: 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."
@@ -254,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"
@@ -274,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"
@@ -330,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"
@@ -474,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"
@@ -603,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"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 4962e70e00557989c2aee6d6da34d4ce742c0c3b..049246c47e1bfe1bd5f128b0f5d6bdf110382b19 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/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-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-06 10: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: 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"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 30895eb866896478a8b64fab45bbb73b991f0f43..4b5c1c4d3ae512c9a1542fd9f732e2b8adadc072 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 07:50+0000\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"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 51874c50a461c970873ff15d9ad55d767cca5914..dd499893e3ce6a6d369f8c04a54547ba5616015d 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-08 21:36-0400\n"
-"PO-Revision-Date: 2013-09-08 16:30+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-09-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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,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"
@@ -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 ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ff85377522573d6d9368fb3d20853564cbd348a5..50ceb17f76cfe8968c9b36846adca139df3759db 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-08 21:36-0400\n"
-"PO-Revision-Date: 2013-09-08 17:40+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-09-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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -131,11 +131,15 @@ msgstr "Oppdater"
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 "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
-#: js/personal.js:172
+#: js/personal.js:284
msgid "Saving..."
msgstr "Lagrar …"
@@ -151,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"
@@ -180,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"
@@ -346,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 "
@@ -417,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"
@@ -441,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"
@@ -457,38 +461,66 @@ 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 "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 "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
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 "Innloggingspassord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekrypter alle filene"
@@ -514,30 +546,30 @@ msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilen
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/nqo/core.po b/l10n/nqo/core.po
index b0cbd8bf9f308f8ee676040eedd901de18917a84..27d872844d4509524b55e71f69e1fffba83745de 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+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: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/nqo/lib.po b/l10n/nqo/lib.po
index 0c4a68dff9dd6216934eab236cab4ce498c96d26..6f2612e081723bed36702f55ac278f6739fc5a63 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: 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"
+"POT-Creation-Date: 2013-09-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"
@@ -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 ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index 6c18abbb14218d4dec7606b84e58528bdb512ac8..8faee77648b17473500c10eea38f994da7132a76 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+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: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\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 ""
@@ -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/oc/core.po b/l10n/oc/core.po
index b8f937e6823a574b6e0a4ef56a1dd4bd9af03327..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "uèi"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "mes passat"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses a"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "an passat"
-#: js/js.js:831
+#: 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 ""
@@ -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 f41c123348c86b420c29ea9dcf869b960055a61c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 d004fe066ebdd7701d1ff8bc64af9c6f44d14cba..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "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/pl/core.po b/l10n/pl/core.po
index 168f599bcab0059ee37d58719ac7cf9e8e92eb12..7e3a4dd2baa6872116af964d496b5126a5399b28 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:40+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute temu"
msgstr[1] "%n minut temu"
msgstr[2] "%n minut temu"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n godzine temu"
msgstr[1] "%n godzin temu"
msgstr[2] "%n godzin temu"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "dziÅ›"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dzień temu"
msgstr[1] "%n dni temu"
msgstr[2] "%n dni temu"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n miesiÄ…c temu"
msgstr[1] "%n miesięcy temu"
msgstr[2] "%n miesięcy temu"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:831
+#: 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"
@@ -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 df1d1d20470bafd02b2725680f1abbd5eaf365d6..780faa39bcc43c2b3d6d98518cd38bfdae1b2518 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-05 09: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: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 7e1eb8ec3b63577cfd85305b3070d81dd4a1a1a9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:40+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"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 0d7e4c4845295a3e3312cbb164322a64ef9b836c..beae34e58032bc7e70e077bf6d9a9983ee137da3 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-05 07:36-0400\n"
-"PO-Revision-Date: 2013-09-05 10:10+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -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"
@@ -106,37 +118,37 @@ msgstr "Typ archiwum %s nie jest obsługiwany"
msgid "Failed to open archive when installing app"
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 "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 "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 "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 "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 "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 "Katalog aplikacji już isnieje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index f6c9b021ae0b701d4e7d297c2b306fab85d8bcc9..d0f1cfcc15d7cef7abc735fa36610f8f9c5e06db 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:40+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@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: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -130,11 +130,15 @@ msgstr "Aktualizuj"
msgid "Updated"
msgstr "Zaktualizowano"
-#: 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 "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
-#: js/personal.js:172
+#: 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"
@@ -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,38 +460,66 @@ 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 "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 "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Hasło logowania"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Odszyfruj wszystkie pliki"
@@ -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/pt_BR/core.po b/l10n/pt_BR/core.po
index 95c5f1a6021d2c691aea2f296a03f962c2ba20c8..f8c924a94752d4f90c14c59898b257f906f0ea68 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 13:20+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: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " ha %n minuto"
msgstr[1] "ha %n minutos"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "ha %n hora"
msgstr[1] "ha %n horas"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hoje"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "ha %n dia"
msgstr[1] "ha %n dias"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "último mês"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "ha %n mês"
msgstr[1] "ha %n meses"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "último ano"
-#: js/js.js:831
+#: 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"
@@ -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 258f0d4461c291f08653f8d74c7237ddab588f3a..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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 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: 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_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 186e192e9a2941b39f419182499b585f5ee9b78f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 93b24783ce8f5826dfaa4c3db6e6d084d0db707a..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-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 13:20+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"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 0e491b5b608e2327ac479eabe93544505c003061..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-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"
+"POT-Creation-Date: 2013-09-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"
@@ -130,11 +130,15 @@ msgstr "Atualizar"
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_PT/core.po b/l10n/pt_PT/core.po
index 0af6cd62e19567d0ba0f9875b2b58c299e908436..b355ad56e022a0f37bbc1b12f633bb7034909942 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 08: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: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,11 +44,11 @@ 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
@@ -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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto atrás"
msgstr[1] "%n minutos atrás"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora atrás"
msgstr[1] "%n horas atrás"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hoje"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dia atrás"
msgstr[1] "%n dias atrás"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "ultÃmo mês"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mês atrás"
msgstr[1] "%n meses atrás"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "ano passado"
-#: js/js.js:831
+#: 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"
@@ -409,7 +433,7 @@ msgstr "A actualização foi concluÃda com sucesso. Vai ser redireccionado para
#: 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 ad35a566339b34cd82d34701df6379749ef282ce..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index f6f24ab8da1cfd84ee5863039e0d7d6a6d99a7fb..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-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 08: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: 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 ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index b844821c4d1108d66b8e353b0fedf4ff739c0599..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/ro/core.po b/l10n/ro/core.po
index b0bcda7f54196279cb6ff1c34baff05cba5be473..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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 14:30+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "astăzi"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:831
+#: 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"
@@ -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 1d6755cb53e19fe2e03ce364c41f9165d74452f9..0ac14ca3c9100e59bbcdd247218ff75f214f6dd0 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-10 14:41+0000\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"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 2904f399a431cf33407659fa41ff4272aed08c61..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 cc6ceeae392ab36eb0af6075bbd110f0064ea1fd..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -129,11 +129,15 @@ msgstr "Actualizare"
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/ru/core.po b/l10n/ru/core.po
index d4f0601de0942f1ec37c35b79dc18943a17d4b9e..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "неÑколько Ñекунд назад"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "ÑегоднÑ"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "в прошлом меÑÑце"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "неÑколько меÑÑцев назад"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:831
+#: 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 "ПиÑьмо отправлено"
@@ -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 4692762ac928be53b2369ff7c9650fa9bd694e61..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 1f199e7b7886542f19dbc8b47509ae66c7ef7eaf..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -135,11 +135,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 "Сохранение..."
@@ -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/si_LK/core.po b/l10n/si_LK/core.po
index 4dd2f29f84ce83b734aaa5b78a4d69988adf1824..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "අද"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "පෙර මà·à·ƒà¶ºà·š"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "මà·à·ƒ කීපයකට පෙර"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:831
+#: 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 ""
@@ -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 d64ece397acf0e8a399aabd56821d9749e65e26a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 eb89035ca94e1679024064ed968a71455387b74f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/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 70e16033524e32077986bd2879ca2ab6af04978a..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "dnes"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:831
+#: 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ý"
@@ -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 8cefa0e8452b4ada8b33fc0007b26492d748af9e..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 b2bca71bb2ee5273e244acea4d911b40a7ee8822..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/sl/core.po b/l10n/sl/core.po
index c110bdd23b0dbc537447450357b70c6a6a7cad4c..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "danes"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "vÄeraj"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:831
+#: 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"
@@ -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 8032c31afc20b490fa78564c1cc340e0cbadbca3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 79967879aabd391e0034789194a2f24fa2406c62..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -130,11 +130,15 @@ msgstr "Posodobi"
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/sq/core.po b/l10n/sq/core.po
index 915ef08c5f964aaebe7addd48442c066d5d8d098..d87486309e3f7a7f6f5e53bab5dbfc06e6dc94d9 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 23:00+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.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: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut më parë"
msgstr[1] "%n minuta më parë"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n orë më parë"
msgstr[1] "%n orë më parë"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "sot"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "dje"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ditë më parë"
msgstr[1] "%n ditë më parë"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n muaj më parë"
msgstr[1] "%n muaj më parë"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:831
+#: 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"
@@ -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"
@@ -602,7 +626,7 @@ msgstr "Mbaro setup-in"
msgid "%s is available. Get more information on how to update."
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"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 949da8324ff5dd211bb332e7b6ff4a1280c376e5..3bf0e4962c0823e69fd09c8489f5029c0e2fb5ec 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 23: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: Odeen <rapid_odeen@zoho.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index f9206290886125650bcef598555ab87ee4061141..e1a91f7789c8f1bc0de8c9364305cc85f416618a 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/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-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 23:40+0000\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"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 87c35751041675d7d25ef54b4c61b9de9d6f8a40..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-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 22: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: 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 ""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 3f7c530d73b0822b8920fc165d0bf5a990744517..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-09-10 10:41-0400\n"
-"PO-Revision-Date: 2013-09-09 23: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: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -128,11 +128,15 @@ msgstr "Azhurno"
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 "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/sr/core.po b/l10n/sr/core.po
index 9df2f05ad78af4a8c3f54fc9854ac408150ad054..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "пре неколико Ñекунди"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "данаÑ"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "прошлог меÑеца"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "меÑеци раније"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "прошле године"
-#: js/js.js:831
+#: 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 "Порука је поÑлата"
@@ -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 1e1a3f4e98f772bcfd2f4fdbd9731d94af53c07f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 81328359c1d77469b49026c3c6876a36c2337872..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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@latin/core.po b/l10n/sr@latin/core.po
index 3b94853a9586e2f4bd33bfd05be9d81e3e94f9d3..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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 (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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 00ac03d66b5fe414ac3084f649a096d4b5bef5bf..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 8e5d2b4c2ea0a4385c743a16df6de592d16ca950..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "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/sv/core.po b/l10n/sv/core.po
index 989c71a1344f3a70b1ba76cec4075af75e7dc8c1..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "i dag"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "i går"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "månader sedan"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "förra året"
-#: js/js.js:831
+#: 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"
@@ -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 908a393131d4c141634554caaa42bec4ff6df7d0..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 431588e31f5b1615efd1da7d63c47e3a3f227bc8..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-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"
+"POT-Creation-Date: 2013-09-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"
@@ -134,11 +134,15 @@ msgstr "Uppdatera"
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/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 e2ce13ab2309fa82a7968bd502c334d1e11bbd5f..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "செகà¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "இனà¯à®±à¯"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "நேறà¯à®±à¯"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "கடநà¯à®¤ மாதமà¯"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "மாதஙà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯"
-#: js/js.js:831
+#: 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 ""
@@ -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 b38e26a728c315eadc5a1fc871c1ab1abd38ee33..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 9105b4a69506ce052b8b66f0e9d92b626c54cd3e..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "_மொழி_பெயரà¯_"
@@ -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/te/core.po b/l10n/te/core.po
index 83006f1923c07872439a469783800fb7ac34e821..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "ఈరోజà±"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "నినà±à°¨"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "నెలల à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "పోయిన సంవతà±à°¸à°°à°‚"
-#: js/js.js:831
+#: 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 ""
@@ -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/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 20049af7717f350ab85f4fd31efecf3a4abe6b9b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/templates/core.pot b/l10n/templates/core.pot
index 44fea90143b43a8880ccf6569586da4a63def79f..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-10 10:41-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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 9696122a837107a19ffda42c202dfdf76879ee4d..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-10 10:41-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 9e43dd73affbb34e256a7669d463682a0f3ecd9b..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-10 10:41-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 b6a76cb00fc2396a09a8f473a619d2a7564ba4e4..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-10 10:41-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 1ff57c35ad20c63b24148de90282056a4edeed1d..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-10 10:41-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 8e4e83df745c2849bd9cb21d586ce5c1e35ecf3f..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-10 10:41-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 a88051bb451be797db93c83188b634171b69dfda..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-10 10:41-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 dd7d5cd1bd94941d890e39e06f5bb535c134746e..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-10 10:41-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 cdb551ec943c43cf51517c00a8979bd82ca62df2..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-10 10:41-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 9024b177c3895cc28cbef6f8f3ad4d72916329fa..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-10 10:41-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 8fc98e5791f0929a8574657cff63f6506d60d730..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-10 10:41-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 06fd34247802a769e7c0d38399121090f4503782..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "วินาที à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "วันนี้"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "เมื่à¸à¸§à¸²à¸™à¸™à¸µà¹‰"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "เดืà¸à¸™à¸—ี่à¹à¸¥à¹‰à¸§"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "เดืà¸à¸™ ที่ผ่านมา"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "ปีที่à¹à¸¥à¹‰à¸§"
-#: js/js.js:831
+#: 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 "ส่งà¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
@@ -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 b9a165c4814695aa872b6ea66a70dbdc0dd96a21..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 81a63f742cb10a5284fa875dd04430c6221db853..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "ภาษาไทย"
@@ -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/tr/core.po b/l10n/tr/core.po
index e8dbd20a138df9e422b9feb9cae3ba573b1190e5..eed4853b177a5797d9b5b2144b1d3060dd845631 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+0000\n"
-"Last-Translator: Fatih Aşıcı <fatih.asici@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: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -93,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"
@@ -169,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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:822
+#: 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:823
+#: 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:824
+#: js/js.js:856
msgid "today"
msgstr "bugün"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "dün"
-#: js/js.js:826
+#: 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:827
+#: js/js.js:859
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:828
+#: 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:829
+#: js/js.js:861
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:831
+#: js/js.js:863
msgid "years ago"
msgstr "yıl önce"
@@ -229,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."
@@ -254,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"
@@ -274,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 "
@@ -330,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"
@@ -474,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"
@@ -603,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 ce183ac93d587c45e1b563822ee64cd8a9fec517..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 ecad53e30f6ef5924bea74dbfe8eaa05c96b17f9..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -132,11 +132,15 @@ msgstr "Güncelleme"
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/ug/core.po b/l10n/ug/core.po
index a5cfb82e292cd6cda511bb22eaa7f7bf182613cf..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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 7f92bdfcdd43464686262dbd08399e2e9f5fac1a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 17d00d8a61658d5fdf77a96e5a765e8bd0ad671c..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "ئۇيغۇرچە"
@@ -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/uk/core.po b/l10n/uk/core.po
index dd3139936c71cf0f1c1880cad04f4c5a1453c90b..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "Ñекунди тому"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "Ñьогодні"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "минулого міÑÑцÑ"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "міÑÑці тому"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "минулого року"
-#: js/js.js:831
+#: 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 "Ел. пошта надіÑлана"
@@ -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 497990ded391b1693578c12de15e3c0d5d2c4e50..13cbcf246160f6c582047424af40f1eba7defd3b 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-08 21:36-0400\n"
-"PO-Revision-Date: 2013-09-08 12: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: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/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 668895e8dc08062742685c8d638f5ae335a88395..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 260151bbc5a1b3e769f61ce9756ce1e5b8d09f2b..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 "__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_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 3be723e180c351a8de2a9f4eb4b1ae6c1856dba5..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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: 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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr ""
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr ""
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr ""
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr ""
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 ""
@@ -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/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 c323e0f3699795d9683b5c4fecf465710b84d66e..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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/vi/core.po b/l10n/vi/core.po
index 6f1a476bb4db928d20588dc09df2e1eae057afad..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "và i giây trước"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "hôm nay"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "năm trước"
-#: js/js.js:831
+#: 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"
@@ -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 16c04e7896b64af23fb8ceb1f26ab6ed90d92c8f..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 221e49254c4cd30f5513fbdd3929d0b8764fa424..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -128,11 +128,15 @@ msgstr "Cáºp nháºt"
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/zh_CN/core.po b/l10n/zh_CN/core.po
index a533a1d73eeb4b27c255a4b2da973788e17f1f5c..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "秒å‰"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟å‰"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ—¶å‰"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "今天"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "上月"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月å‰"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "月å‰"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "去年"
-#: js/js.js:831
+#: 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 "邮件已å‘é€"
@@ -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 94343f21828dc22a0a13aa2f023c64d65835246a..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 26bf0b96692f59b734257fa5d7baeab439fce802..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -133,11 +133,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 "ä¿å˜ä¸"
@@ -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_HK/core.po b/l10n/zh_HK/core.po
index bf509c72dd31b32211799689fe1c71b602015e49..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11: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 (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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr ""
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "今日"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "å‰ä¸€æœˆ"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "個月之å‰"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr ""
-#: js/js.js:831
+#: 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 "郵件已傳"
@@ -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 f48a313ec7d4c5821a02a5d7df3fc0bfb29f1a68..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
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 a6337dac805b009fefaa1e3196beb1ed4ecf02e1..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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -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 ""
@@ -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_TW/core.po b/l10n/zh_TW/core.po
index 19b6f0e53773aad738070fcd41a592af6108f832..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:50+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:821
+#: js/js.js:853
msgid "seconds ago"
msgstr "幾秒å‰"
-#: js/js.js:822
+#: js/js.js:854
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分é˜å‰"
-#: js/js.js:823
+#: js/js.js:855
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ™‚å‰"
-#: js/js.js:824
+#: js/js.js:856
msgid "today"
msgstr "今天"
-#: js/js.js:825
+#: js/js.js:857
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:826
+#: js/js.js:858
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:827
+#: js/js.js:859
msgid "last month"
msgstr "上個月"
-#: js/js.js:828
+#: js/js.js:860
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月å‰"
-#: js/js.js:829
+#: js/js.js:861
msgid "months ago"
msgstr "幾個月å‰"
-#: js/js.js:830
+#: js/js.js:862
msgid "last year"
msgstr "去年"
-#: js/js.js:831
+#: 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 已寄出"
@@ -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 0b8ed35524897a514e9ce262ec29d8259466b25e..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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 3084cdbc88e37e741f1d0f36abcc3086b84803e2..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-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+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/lib/app.php b/lib/app.php
index 1a0a7e6f9a9b26b43373738167d3f8ce64eb9806..d98af2dc29688956d2a531a5851973b2ccd65299 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -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/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 ea5adbadc9d9f7b04e1d7575d0f6d0b8a0ab3a3e..d3d570e3f372ef8856b2080575757de778eb2005 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -266,6 +266,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");
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/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 98a04486690154f26a6b2fbbb84c2f6f75ebfdc6..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;
}
@@ -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 {
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/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/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/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/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/templatelayout.php b/lib/templatelayout.php
index 0b868a39e490f0cfc7dd42de37b819d07d3314c8..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 {
diff --git a/lib/util.php b/lib/util.php
index 0777643a952978b1a9a44323b82d1d92db4988ea..41f5f1d16be3164c29e0a293a9ae8af2a67677d5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -689,8 +689,8 @@ class OC_Util {
return false;
}
- $fp = @fopen($testfile, 'w');
- @fwrite($fp, $testcontent);
+ $fp = @fopen($testFile, 'w');
+ @fwrite($fp, $testContent);
@fclose($fp);
// accessing the file via http
@@ -700,7 +700,7 @@ class OC_Util {
@fclose($fp);
// cleanup
- @unlink($testfile);
+ @unlink($testFile);
// does it work ?
if($content==$testContent) {
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 77826c82de1965f746ed862af2f47d13fde05ca0..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() !== '') {
@@ -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/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/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/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 1977025cf12def4e8ed25f8b916a48112891b21d..c87bee4ab99781cad34878f1622d7c306607a9e7 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -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/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/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.'
+ );
+ }
}