summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------3rdparty0
-rw-r--r--apps/files/ajax/upload.php9
-rw-r--r--apps/files/appinfo/remote.php2
-rw-r--r--apps/files/js/file-upload.js8
-rw-r--r--apps/files/js/fileactions.js12
-rw-r--r--apps/files/js/filelist.js4
-rw-r--r--apps/files/js/files.js10
-rw-r--r--apps/files/l10n/ru_RU.php14
-rw-r--r--apps/files/l10n/sk_SK.php8
-rw-r--r--apps/files_encryption/l10n/it.php3
-rw-r--r--apps/files_encryption/l10n/ja_JP.php6
-rw-r--r--apps/files_encryption/l10n/nl.php2
-rw-r--r--apps/files_encryption/l10n/sv.php2
-rw-r--r--apps/files_sharing/appinfo/app.php2
-rw-r--r--apps/files_sharing/js/share.js14
-rw-r--r--apps/files_sharing/l10n/pt_PT.php1
-rw-r--r--apps/files_sharing/l10n/ru_RU.php8
-rw-r--r--apps/files_sharing/l10n/sv.php1
-rw-r--r--apps/files_sharing/lib/api.php101
-rw-r--r--apps/files_sharing/lib/maintainer.php44
-rw-r--r--apps/files_sharing/public.php3
-rw-r--r--apps/files_sharing/tests/api.php62
-rw-r--r--apps/files_trashbin/l10n/ru_RU.php5
-rw-r--r--apps/files_versions/js/versions.js7
-rw-r--r--apps/user_ldap/l10n/it.php2
-rw-r--r--apps/user_ldap/l10n/ru_RU.php6
-rw-r--r--apps/user_ldap/l10n/sk_SK.php2
-rw-r--r--apps/user_ldap/l10n/sv.php2
-rw-r--r--apps/user_ldap/lib/access.php2
-rw-r--r--autotest.cmd4
-rw-r--r--config/config.sample.php6
-rw-r--r--core/command/db/generatechangescript.php45
-rw-r--r--core/css/styles.css9
-rw-r--r--core/js/oc-dialogs.js2
-rw-r--r--core/js/share.js116
-rw-r--r--core/l10n/fr.php11
-rw-r--r--core/l10n/hu_HU.php31
-rw-r--r--core/l10n/it.php13
-rw-r--r--core/l10n/ja_JP.php6
-rw-r--r--core/l10n/nl.php11
-rw-r--r--core/l10n/pt_PT.php5
-rw-r--r--core/l10n/ru_RU.php18
-rw-r--r--core/l10n/sk_SK.php36
-rw-r--r--core/l10n/sv.php2
-rw-r--r--core/register_command.php2
-rw-r--r--core/templates/layout.user.php7
-rw-r--r--l10n/ach/lib.po173
-rw-r--r--l10n/ady/lib.po28
-rw-r--r--l10n/af_ZA/lib.po28
-rw-r--r--l10n/ar/lib.po28
-rw-r--r--l10n/be/lib.po173
-rw-r--r--l10n/bg_BG/lib.po28
-rw-r--r--l10n/bn_BD/lib.po28
-rw-r--r--l10n/bs/lib.po173
-rw-r--r--l10n/ca/lib.po30
-rw-r--r--l10n/cs_CZ/lib.po14
-rw-r--r--l10n/cy_GB/lib.po28
-rw-r--r--l10n/da/lib.po30
-rw-r--r--l10n/de/lib.po40
-rw-r--r--l10n/de/settings.po9
-rw-r--r--l10n/de_AT/lib.po173
-rw-r--r--l10n/de_CH/lib.po28
-rw-r--r--l10n/de_DE/lib.po32
-rw-r--r--l10n/el/lib.po28
-rw-r--r--l10n/en@pirate/lib.po173
-rw-r--r--l10n/en_GB/lib.po30
-rw-r--r--l10n/eo/lib.po28
-rw-r--r--l10n/es/lib.po30
-rw-r--r--l10n/es_AR/lib.po28
-rw-r--r--l10n/es_MX/lib.po173
-rw-r--r--l10n/et_EE/lib.po30
-rw-r--r--l10n/et_EE/settings.po18
-rw-r--r--l10n/eu/lib.po28
-rw-r--r--l10n/fa/lib.po28
-rw-r--r--l10n/fi_FI/lib.po30
-rw-r--r--l10n/fr/core.po108
-rw-r--r--l10n/fr/lib.po30
-rw-r--r--l10n/gl/lib.po30
-rw-r--r--l10n/he/lib.po28
-rw-r--r--l10n/hi/lib.po28
-rw-r--r--l10n/hr/lib.po28
-rw-r--r--l10n/hu_HU/core.po149
-rw-r--r--l10n/hu_HU/files.po58
-rw-r--r--l10n/hu_HU/lib.po63
-rw-r--r--l10n/hu_HU/settings.po11
-rw-r--r--l10n/hy/lib.po173
-rw-r--r--l10n/ia/lib.po28
-rw-r--r--l10n/id/lib.po28
-rw-r--r--l10n/is/lib.po28
-rw-r--r--l10n/it/core.po112
-rw-r--r--l10n/it/files_encryption.po12
-rw-r--r--l10n/it/lib.po30
-rw-r--r--l10n/it/user_ldap.po10
-rw-r--r--l10n/ja_JP/core.po98
-rw-r--r--l10n/ja_JP/files_encryption.po18
-rw-r--r--l10n/ja_JP/lib.po30
-rw-r--r--l10n/ka/lib.po28
-rw-r--r--l10n/ka_GE/lib.po28
-rw-r--r--l10n/km/lib.po173
-rw-r--r--l10n/kn/lib.po173
-rw-r--r--l10n/ko/lib.po30
-rw-r--r--l10n/ku_IQ/lib.po28
-rw-r--r--l10n/lb/lib.po28
-rw-r--r--l10n/lt_LT/lib.po30
-rw-r--r--l10n/lv/lib.po28
-rw-r--r--l10n/mk/lib.po28
-rw-r--r--l10n/ml_IN/lib.po173
-rw-r--r--l10n/ms_MY/lib.po28
-rw-r--r--l10n/my_MM/lib.po28
-rw-r--r--l10n/nb_NO/lib.po28
-rw-r--r--l10n/ne/lib.po173
-rw-r--r--l10n/nl/core.po106
-rw-r--r--l10n/nl/files_encryption.po10
-rw-r--r--l10n/nl/lib.po30
-rw-r--r--l10n/nn_NO/lib.po28
-rw-r--r--l10n/nqo/lib.po173
-rw-r--r--l10n/oc/lib.po28
-rw-r--r--l10n/pa/lib.po173
-rw-r--r--l10n/pl/lib.po30
-rw-r--r--l10n/pt_BR/lib.po30
-rw-r--r--l10n/pt_PT/core.po95
-rw-r--r--l10n/pt_PT/files_sharing.po9
-rw-r--r--l10n/pt_PT/lib.po16
-rw-r--r--l10n/ro/lib.po28
-rw-r--r--l10n/ru/lib.po30
-rw-r--r--l10n/ru_RU/core.po749
-rw-r--r--l10n/ru_RU/files.po359
-rw-r--r--l10n/ru_RU/files_encryption.po197
-rw-r--r--l10n/ru_RU/files_external.po123
-rw-r--r--l10n/ru_RU/files_sharing.po80
-rw-r--r--l10n/ru_RU/files_trashbin.po60
-rw-r--r--l10n/ru_RU/files_versions.po43
-rw-r--r--l10n/ru_RU/lib.po341
-rw-r--r--l10n/ru_RU/settings.po609
-rw-r--r--l10n/ru_RU/user_ldap.po410
-rw-r--r--l10n/ru_RU/user_webdavauth.po36
-rw-r--r--l10n/si_LK/lib.po28
-rw-r--r--l10n/sk/lib.po173
-rw-r--r--l10n/sk_SK/core.po160
-rw-r--r--l10n/sk_SK/files.po76
-rw-r--r--l10n/sk_SK/lib.po32
-rw-r--r--l10n/sk_SK/settings.po28
-rw-r--r--l10n/sk_SK/user_ldap.po10
-rw-r--r--l10n/sl/lib.po28
-rw-r--r--l10n/sq/lib.po28
-rw-r--r--l10n/sr/lib.po28
-rw-r--r--l10n/sr@latin/lib.po28
-rw-r--r--l10n/sv/core.po89
-rw-r--r--l10n/sv/files_encryption.po11
-rw-r--r--l10n/sv/files_sharing.po9
-rw-r--r--l10n/sv/lib.po16
-rw-r--r--l10n/sv/settings.po11
-rw-r--r--l10n/sv/user_ldap.po11
-rw-r--r--l10n/sw_KE/lib.po173
-rw-r--r--l10n/ta_LK/lib.po28
-rw-r--r--l10n/te/lib.po28
-rw-r--r--l10n/templates/core.pot82
-rw-r--r--l10n/templates/files.pot56
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_trashbin.pot2
-rw-r--r--l10n/templates/files_versions.pot12
-rw-r--r--l10n/templates/lib.pot10
-rw-r--r--l10n/templates/private.pot10
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/lib.po28
-rw-r--r--l10n/tr/lib.po16
-rw-r--r--l10n/ug/lib.po30
-rw-r--r--l10n/uk/lib.po28
-rw-r--r--l10n/ur_PK/lib.po28
-rw-r--r--l10n/vi/lib.po28
-rw-r--r--l10n/zh_CN/lib.po28
-rw-r--r--l10n/zh_HK/lib.po28
-rw-r--r--l10n/zh_TW/lib.po30
-rw-r--r--lib/base.php1
-rw-r--r--lib/l10n/ca.php1
-rw-r--r--lib/l10n/cs_CZ.php1
-rw-r--r--lib/l10n/da.php1
-rw-r--r--lib/l10n/de.php9
-rw-r--r--lib/l10n/de_DE.php1
-rw-r--r--lib/l10n/en_GB.php1
-rw-r--r--lib/l10n/es.php1
-rw-r--r--lib/l10n/et_EE.php1
-rw-r--r--lib/l10n/fi_FI.php1
-rw-r--r--lib/l10n/fr.php1
-rw-r--r--lib/l10n/gl.php1
-rw-r--r--lib/l10n/hu_HU.php17
-rw-r--r--lib/l10n/it.php1
-rw-r--r--lib/l10n/ja_JP.php1
-rw-r--r--lib/l10n/ko.php1
-rw-r--r--lib/l10n/lt_LT.php1
-rw-r--r--lib/l10n/nl.php1
-rw-r--r--lib/l10n/pl.php1
-rw-r--r--lib/l10n/pt_BR.php1
-rw-r--r--lib/l10n/ru.php1
-rw-r--r--lib/l10n/ru_RU.php10
-rw-r--r--lib/l10n/sk_SK.php2
-rw-r--r--lib/l10n/sv.php1
-rw-r--r--lib/l10n/tr.php1
-rw-r--r--lib/l10n/zh_TW.php1
-rw-r--r--lib/private/app.php10
-rw-r--r--lib/private/appconfig.php6
-rw-r--r--lib/private/connector/sabre/server.php235
-rw-r--r--lib/private/davclient.php46
-rw-r--r--lib/private/db/mdb2schemamanager.php22
-rw-r--r--lib/private/log/owncloud.php1
-rw-r--r--lib/private/preview/movies.php52
-rw-r--r--lib/private/preview/office-cl.php160
-rw-r--r--lib/private/preview/office.php25
-rw-r--r--lib/private/preview/provider.php12
-rw-r--r--lib/private/preview/txt.php35
-rw-r--r--lib/private/preview/unknown.php26
-rwxr-xr-xlib/private/util.php11
-rw-r--r--lib/public/app.php48
-rw-r--r--lib/public/appframework/http/response.php14
-rw-r--r--lib/public/config.php14
-rw-r--r--lib/public/db.php12
-rw-r--r--lib/public/files.php28
-rw-r--r--lib/public/icache.php6
-rw-r--r--lib/public/idbconnection.php16
-rw-r--r--lib/public/il10n.php8
-rw-r--r--lib/public/response.php10
-rw-r--r--lib/public/share.php82
-rw-r--r--lib/public/template.php60
-rw-r--r--lib/public/user.php51
-rw-r--r--settings/css/settings.css6
-rw-r--r--settings/l10n/de.php2
-rw-r--r--settings/l10n/et_EE.php14
-rw-r--r--settings/l10n/hu_HU.php2
-rw-r--r--settings/l10n/ru_RU.php7
-rw-r--r--settings/l10n/sk_SK.php11
-rw-r--r--settings/l10n/sv.php2
-rw-r--r--settings/templates/admin.php4
-rw-r--r--tests/data/openssl.cnf350
-rw-r--r--tests/preseed-config.php5
-rw-r--r--tests/win32-phpunit.php347
239 files changed, 7547 insertions, 3906 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 98fdc3a4e2f56f7d231470418222162dbf95f46
+Subproject 42efd966284debadf83b761367e529bc45f806d
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 2c1be428e84..38c2a053a9e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -7,6 +7,8 @@ OCP\JSON::setContentTypeHeader('text/plain');
// If not, check the login.
// If no token is sent along, rely on login only
+$allowedPermissions = OCP\PERMISSION_ALL;
+
$l = OC_L10N::get('files');
if (empty($_POST['dirToken'])) {
// The standard case, files are uploaded through logged in users :)
@@ -17,6 +19,9 @@ if (empty($_POST['dirToken'])) {
die();
}
} else {
+ // return only read permissions for public upload
+ $allowedPermissions = OCP\PERMISSION_READ;
+
$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
if ($linkItem === false) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
@@ -130,7 +135,7 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
- 'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
+ 'permissions' => $meta['permissions'] & $allowedPermissions
);
}
@@ -156,7 +161,7 @@ if (strpos($dir, '..') === false) {
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
- 'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
+ 'permissions' => $meta['permissions'] & $allowedPermissions
);
}
}
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 0c1f2e6580c..75c80cd49f3 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -39,7 +39,7 @@ $rootDir = new OC_Connector_Sabre_Directory('');
$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir);
// Fire up server
-$server = new Sabre_DAV_Server($objectTree);
+$server = new OC_Connector_Sabre_Server($objectTree);
$server->httpRequest = $requestBackend;
$server->setBaseUri($baseuri);
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index c03e9037cec..fefb06a8ac5 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -124,7 +124,11 @@ OC.Upload = {
*/
onReplace:function(data){
this.log('replace', null, data);
- data.data.append('resolution', 'replace');
+ if (data.data){
+ data.data.append('resolution', 'replace');
+ } else {
+ data.formData.push({name:'resolution',value:'replace'}); //hack for ie8
+ }
data.submit();
},
/**
@@ -535,7 +539,7 @@ $(document).ready(function() {
lazyLoadPreview(path, result.data.mime, function(previewpath){
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
- FileActions.display(tr.find('td.filename'));
+ FileActions.display(tr.find('td.filename'), true);
} else {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
}
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index e14e52eb6ca..03e23189a97 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -61,7 +61,13 @@ var FileActions = {
var actions = this.get(mime, type, permissions);
return actions[name];
},
- display: function (parent) {
+ /**
+ * Display file actions for the given element
+ * @param parent "td" element of the file for which to display actions
+ * @param triggerEvent if true, triggers the fileActionsReady on the file
+ * list afterwards (false by default)
+ */
+ display: function (parent, triggerEvent) {
FileActions.currentFile = parent;
var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var file = FileActions.getCurrentFile();
@@ -137,6 +143,10 @@ var FileActions = {
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
parent.parent().children().last().append(element);
}
+
+ if (triggerEvent){
+ $('#fileList').trigger(jQuery.Event("fileActionsReady"));
+ }
},
getCurrentFile: function () {
return FileActions.currentFile.parent().attr('data-file');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e7edd2cf388..84ff1093253 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -151,7 +151,7 @@ var FileList={
if (hidden) {
tr.hide();
}
- FileActions.display(tr.find('td.filename'));
+ FileActions.display(tr.find('td.filename'), true);
return tr;
},
/**
@@ -817,7 +817,7 @@ $(document).ready(function(){
data.context.attr('data-permissions', file.permissions);
data.context.data('permissions', file.permissions);
}
- FileActions.display(data.context.find('td.filename'));
+ FileActions.display(data.context.find('td.filename'), true);
var path = getPathForPreview(file.name);
lazyLoadPreview(path, file.mime, function(previewpath){
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a35ed4add8c..c3a8d81b50d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -301,7 +301,7 @@ $(document).ready(function() {
});
$('.download').click('click',function(event) {
- var files=getSelectedFiles('name');
+ var files=getSelectedFilesTrash('name');
var fileslist = JSON.stringify(files);
var dir=$('#dir').val()||'/';
OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
@@ -315,7 +315,7 @@ $(document).ready(function() {
});
$('.delete-selected').click(function(event) {
- var files=getSelectedFiles('name');
+ var files=getSelectedFilesTrash('name');
event.preventDefault();
FileList.do_delete(files);
return false;
@@ -433,7 +433,7 @@ var createDragShadow = function(event){
$(event.target).parents('tr').find('td input:first').prop('checked',true);
}
- var selectedFiles = getSelectedFiles();
+ var selectedFiles = getSelectedFilesTrash();
if (!isDragSelected && selectedFiles.length == 1) {
//revert the selection
@@ -562,7 +562,7 @@ var crumbDropOptions={
}
function procesSelection(){
- var selected=getSelectedFiles();
+ var selected=getSelectedFilesTrash();
var selectedFiles=selected.filter(function(el){return el.type=='file'});
var selectedFolders=selected.filter(function(el){return el.type=='dir'});
if(selectedFiles.length==0 && selectedFolders.length==0) {
@@ -607,7 +607,7 @@ function procesSelection(){
* if property is set, an array with that property for each file is returnd
* if it's ommited an array of objects with all properties is returned
*/
-function getSelectedFiles(property){
+function getSelectedFilesTrash(property){
var elements=$('td.filename input:checkbox:checked').parent().parent();
var files=[];
elements.each(function(i,element){
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
new file mode 100644
index 00000000000..0764fef2ed9
--- /dev/null
+++ b/apps/files/l10n/ru_RU.php
@@ -0,0 +1,14 @@
+<?php
+$TRANSLATIONS = array(
+"Files" => "Файлы",
+"Error" => "Ошибка",
+"Share" => "Сделать общим",
+"Rename" => "Переименовать",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"Upload" => "Загрузка",
+"Cancel upload" => "Отмена загрузки",
+"Download" => "Загрузка"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 962ce7d7e9b..c246492211c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Chýba dočasný priečinok",
"Failed to write to disk" => "Zápis na disk sa nepodaril",
"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
+"Upload failed. Could not get file info." => "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
+"Upload failed. Could not find uploaded file" => "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor",
"Invalid directory." => "Neplatný priečinok.",
"Files" => "Súbory",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
"Not enough space available" => "Nie je k dispozícii dostatok miesta",
"Upload cancelled." => "Odosielanie zrušené.",
+"Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
"URL cannot be empty." => "URL nemôže byť prázdne.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
@@ -33,14 +37,18 @@ $TRANSLATIONS = array(
"undo" => "vrátiť",
"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
+"{dirs} and {files}" => "{dirs} a {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
"'.' is an invalid file name." => "'.' je neplatné meno súboru.",
"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
"Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
+"Error moving file" => "Chyba pri presúvaní súboru",
"Name" => "Názov",
"Size" => "Veľkosť",
"Modified" => "Upravené",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index c93afa15729..fa3a9e39782 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -8,7 +8,10 @@ $TRANSLATIONS = array(
"Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
"Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
"Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
"Your private key is not valid! Likely your password was changed outside 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." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+"Unknown error please check your system settings or contact your administrator" => "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore",
"Missing requirements." => "Requisiti mancanti.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index fa536dca9b9..689fb78d074 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "暗号化アプリが初期化されていません。暗号化アプリが接続中に再度有効かされた可能性があります。暗号化アプリを初期化する為に、1回ログアウトしてログインしなおしてください。",
"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." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+"Unknown error please check your system settings or contact your administrator" => "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
"Missing requirements." => "必要要件が満たされていません。",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません:",
"Saving..." => "保存中...",
+"Go directly to your " => "あなたのディレクトリへ",
"personal settings" => "秘密鍵をアンロックできます",
"Encryption" => "暗号化",
"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
"Recovery key password" => "復旧キーのパスワード",
+"Repeat Recovery key password" => "復旧キーのパスワードをもう一度入力",
"Enabled" => "有効",
"Disabled" => "無効",
"Change recovery key password:" => "復旧キーのパスワードを変更:",
"Old Recovery key password" => "古い復旧キーのパスワード",
"New Recovery key password" => "新しい復旧キーのパスワード",
+"Repeat New Recovery key password" => "新しい復旧キーのパスワードをもう一度入力",
"Change Password" => "パスワードを変更",
"Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
"Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 86d56e40315..5eed2bfe66a 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
"Your private key is not valid! Likely your password was changed outside 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." => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
+"Unknown error please check your system settings or contact your administrator" => "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder",
"Missing requirements." => "Missende benodigdheden.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index f806c3cc3e6..a3ffe18bfa2 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
"Your private key is not valid! Likely your password was changed outside 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." => "Lösenordet för din privata nyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera lösenordet för den privata nyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
+"Unknown error please check your system settings or contact your administrator" => "Oväntat fel, kolla dina system inställningar eller kontakta din administratör",
"Missing requirements." => "Krav som saknas",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index ffdcbf05109..bdaea64bb90 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -8,6 +8,7 @@ OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permiss
OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php';
OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
OC::$CLASSPATH['OCA\Files\Share\Api'] = 'files_sharing/lib/api.php';
+OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
@@ -17,3 +18,4 @@ OCP\Util::addScript('files_sharing', 'share');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
+\OC_Hook::connect('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 03ed02f41ef..68f6f3ba76f 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,11 +1,19 @@
$(document).ready(function() {
- var disableSharing = $('#disableSharing').data('status');
+ var disableSharing = $('#disableSharing').data('status'),
+ sharesLoaded = false;
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
-
$('#fileList').on('fileActionsReady',function(){
- OC.Share.loadIcons('file');
+ if (!sharesLoaded){
+ OC.Share.loadIcons('file');
+ // assume that we got all shares, so switching directories
+ // will not invalidate that list
+ sharesLoaded = true;
+ }
+ else{
+ OC.Share.updateIcons('file');
+ }
});
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 7fa1876aaac..ce513485497 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"This share is password-protected" => "Esta partilha está protegida por palavra-chave",
"The password is wrong. Try again." => "Password errada, por favor tente de novo",
"Password" => "Password",
"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
new file mode 100644
index 00000000000..2686b1e852d
--- /dev/null
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Password" => "Пароль",
+"Download" => "Загрузка",
+"Upload" => "Загрузка",
+"Cancel upload" => "Отмена загрузки"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 23bf17aba45..64e8a389429 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"This share is password-protected" => "Den här delningen är lösenordsskyddad",
"The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
"Password" => "Lösenord",
"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.",
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index bd9beddf063..84e90c71681 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -36,10 +36,17 @@ class Api {
$params['itemSource'] = self::getFileId($_GET['path']);
$params['path'] = $_GET['path'];
$params['itemType'] = self::getItemType($_GET['path']);
- if (isset($_GET['subfiles']) && $_GET['subfiles'] === 'true') {
+
+ if ( isset($_GET['reshares']) && $_GET['reshares'] !== 'false' ) {
+ $params['reshares'] = true;
+ } else {
+ $params['reshares'] = false;
+ }
+
+ if (isset($_GET['subfiles']) && $_GET['subfiles'] !== 'false') {
return self::getSharesFromFolder($params);
}
- return self::getShare($params);
+ return self::collectShares($params);
}
$share = \OCP\Share::getItemShared('file', null);
@@ -59,34 +66,49 @@ class Api {
* @return \OC_OCS_Result share information
*/
public static function getShare($params) {
- // either the $params already contains a itemSource if we come from
- // getAllShare() or we need to translate the shareID to a itemSource
- if(isset($params['itemSource'])) {
- $itemSource = $params['itemSource'];
- $itemType = $params['itemType'];
- $getSpecificShare = true;
- } else {
- $s = self::getShareFromId($params['id']);
- $itemSource = $s['item_source'];
- $itemType = $s['item_type'];
- $getSpecificShare = false;
- }
+
+ $s = self::getShareFromId($params['id']);
+ $params['itemSource'] = $s['item_source'];
+ $params['itemType'] = $s['item_type'];
+ $params['specificShare'] = true;
+
+ return self::collectShares($params);
+ }
+
+ /**
+ * @brief collect all share information, either of a specific share or all
+ * shares for a given path
+ * @param array $params
+ * @return \OC_OCS_Result
+ */
+ private static function collectShares($params) {
+
+ $itemSource = $params['itemSource'];
+ $itemType = $params['itemType'];
+ $getSpecificShare = isset($params['specificShare']) ? $params['specificShare'] : false;
if ($itemSource !== null) {
$shares = \OCP\Share::getItemShared($itemType, $itemSource);
- $reshare = \OCP\Share::getItemSharedWithBySource($itemType, $itemSource);
+ $receivedFrom = \OCP\Share::getItemSharedWithBySource($itemType, $itemSource);
// if a specific share was specified only return this one
- if ($getSpecificShare === false) {
+ if ($getSpecificShare === true) {
foreach ($shares as $share) {
- if ($share['id'] === (int)$params['id']) {
+ if ($share['id'] === (int) $params['id']) {
$shares = array('element' => $share);
break;
}
}
}
- if ($reshare) {
- $shares['received_from'] = $reshare['uid_owner'];
- $shares['received_from_displayname'] = \OCP\User::getDisplayName($reshare['uid_owner']);
+
+ // include also reshares in the lists. This means that the result
+ // will contain every user with access to the file.
+ if (isset($params['reshares']) && $params['reshares'] === true) {
+ $shares = self::addReshares($shares, $itemSource);
+ }
+
+ if ($receivedFrom) {
+ $shares['received_from'] = $receivedFrom['uid_owner'];
+ $shares['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
}
} else {
$shares = null;
@@ -100,6 +122,37 @@ class Api {
}
/**
+ * @brief add reshares to a array of shares
+ * @param array $shares array of shares
+ * @param int $itemSource item source ID
+ * @return array new shares array which includes reshares
+ */
+ private static function addReshares($shares, $itemSource) {
+
+ // if there are no shares than there are also no reshares
+ $firstShare = reset($shares);
+ if ($firstShare) {
+ $path = $firstShare['path'];
+ } else {
+ return $shares;
+ }
+
+ $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path` , `permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`, `mail_send`';
+ $getReshares = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*share`.`file_source` = ? AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\') AND `uid_owner` != ?');
+ $reshares = $getReshares->execute(array($itemSource, \OCP\User::getUser()))->fetchAll();
+
+ foreach ($reshares as $key => $reshare) {
+ if (isset($reshare['share_with']) && $reshare['share_with'] !== '') {
+ $reshares[$key]['share_with_displayname'] = \OCP\User::getDisplayName($reshare['share_with']);
+ }
+ // add correct path to the result
+ $reshares[$key]['path'] = $path;
+ }
+
+ return array_merge($shares, $reshares);
+ }
+
+ /**
* @brief get share from all files in a given folder (non-recursive)
* @param array $params contains 'path' to the folder
* @return \OC_OCS_Result
@@ -119,10 +172,10 @@ class Api {
// workaround because folders are named 'dir' in this context
$itemType = $file['type'] === 'file' ? 'file' : 'folder';
$share = \OCP\Share::getItemShared($itemType, $file['fileid']);
- $reshare = \OCP\Share::getItemSharedWithBySource($itemType, $file['fileid']);
- if ($reshare) {
- $share['received_from'] = $reshare['uid_owner'];
- $share['received_from_displayname'] = \OCP\User::getDisplayName($reshare['uid_owner']);
+ $receivedFrom = \OCP\Share::getItemSharedWithBySource($itemType, $file['fileid']);
+ if ($receivedFrom) {
+ $share['received_from'] = $receivedFrom['uid_owner'];
+ $share['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
}
if ($share) {
$share['filename'] = $file['name'];
diff --git a/apps/files_sharing/lib/maintainer.php b/apps/files_sharing/lib/maintainer.php
new file mode 100644
index 00000000000..bbb3268410e
--- /dev/null
+++ b/apps/files_sharing/lib/maintainer.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\Files\Share;
+
+/**
+ * Maintains stuff around the sharing functionality
+ *
+ * for example: on disable of "allow links" it removes all link shares
+ */
+
+class Maintainer {
+
+ /**
+ * Keeps track of the "allow links" config setting
+ * and removes all link shares if the config option is set to "no"
+ *
+ * @param array with app, key, value as named values
+ */
+ static public function configChangeHook($params) {
+ if($params['app'] === 'core' && $params['key'] === 'shareapi_allow_links' && $params['value'] === 'no') {
+ \OCP\Share::removeAllLinkShares();
+ }
+ }
+
+}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 8bdbc8524e6..3d02227cb08 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -234,8 +234,9 @@ if (isset($path)) {
$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$folder->assign('usedSpacePercent', 0);
$tmpl->assign('folder', $folder->fetchPage());
+ $maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
$allowZip = OCP\Config::getSystemValue('allowZipDownload', true)
- && $totalSize <= OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
+ && ( $maxInputFileSize === 0 || $totalSize <= $maxInputFileSize);
$tmpl->assign('allowZipDownload', intval($allowZip));
$tmpl->assign('downloadURL',
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 529140849c6..44fc4d8b7b3 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -31,6 +31,7 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
+ const TEST_FILES_SHARING_API_USER3 = "test-share-user3";
public $stateFilesEncryption;
public $filename;
@@ -54,6 +55,7 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
// create users
self::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1, true);
self::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, true);
+ self::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, true);
}
@@ -101,6 +103,7 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
// cleanup users
\OC_User::deleteUser(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
\OC_User::deleteUser(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+ \OC_User::deleteUser(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3);
}
/**
@@ -197,10 +200,9 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK,
null, 1);
- $params = array('itemSource' => $fileInfo['fileid'],
- 'itemType' => 'file');
+ $_GET['path'] = $this->filename;
- $result = Share\Api::getShare($params);
+ $result = Share\Api::getAllShares(array());
$this->assertTrue($result->succeeded());
@@ -218,6 +220,60 @@ class Test_Files_Sharing_Api extends \PHPUnit_Framework_TestCase {
* @medium
* @depends testCreateShare
*/
+ function testGetShareFromSourceWithReshares() {
+
+ $fileInfo = $this->view->getFileInfo($this->filename);
+
+ // share the file as user1 to user2
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+ // login as user2 and reshare the file to user3
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31);
+
+ // login as user1 again
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+ $_GET['path'] = $this->filename;
+
+ $result = Share\Api::getAllShares(array());
+
+ $this->assertTrue($result->succeeded());
+
+ // test should return one share
+ $this->assertTrue(count($result->getData()) === 1);
+
+ // now also ask for the reshares
+ $_GET['reshares'] = 'true';
+
+ $result = Share\Api::getAllShares(array());
+
+ $this->assertTrue($result->succeeded());
+
+ // now we should get two shares, the initial share and the reshare
+ $this->assertTrue(count($result->getData()) === 2);
+
+ // unshare files again
+
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3);
+
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+ \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ }
+
+ /**
+ * @medium
+ * @depends testCreateShare
+ */
function testGetShareFromId() {
$fileInfo = $this->view->getFileInfo($this->filename);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
new file mode 100644
index 00000000000..3129ff95eb4
--- /dev/null
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "Ошибка"
+);
+$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_versions/js/versions.js b/apps/files_versions/js/versions.js
index 3f56a3eb698..d118456d62e 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,5 +1,12 @@
$(document).ready(function(){
+ if ($('#isPublic').val()){
+ // no versions actions in public mode
+ // beware of https://github.com/owncloud/core/issues/4545
+ // as enabling this might hang Chrome
+ return;
+ }
+
if (typeof FileActions !== 'undefined') {
// Add versions button to 'files/index.php'
FileActions.register(
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 914cc3d32ae..173f359b2fa 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
"Internal Username Attribute:" => "Attributo nome utente interno:",
"Override UUID detection" => "Ignora rilevamento 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." => "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"UUID Attribute for Users:" => "Attributo UUID per gli utenti:",
+"UUID Attribute for Groups:" => "Attributo UUID per i gruppi:",
"Username-LDAP User Mapping" => "Associazione Nome utente-Utente 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." => "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
new file mode 100644
index 00000000000..fc31eebbef1
--- /dev/null
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "Ошибка",
+"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/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 08b32e75f93..a2ceb84d4eb 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
"Internal Username Attribute:" => "Atribút interného používateľského mena:",
"Override UUID detection" => "Prepísať UUID detekciu",
"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." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
+"UUID Attribute for Users:" => "UUID atribút pre používateľov:",
+"UUID Attribute for Groups:" => "UUID atribút pre skupiny:",
"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
"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." => "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index a5c060c717d..c081d70b950 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
"Internal Username Attribute:" => "Internt Användarnamn Attribut:",
"Override UUID detection" => "Åsidosätt UUID detektion",
"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." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
+"UUID Attribute for Users:" => "UUID Attribut för Användare:",
+"UUID Attribute for Groups:" => "UUID Attribut för Grupper:",
"Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping",
"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
"Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f75a78bcb0b..0d6cc7cfd27 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1021,7 +1021,7 @@ class Access extends LDAPUtility {
$bases = $this->sanitizeDN($bases);
foreach($bases as $base) {
$belongsToBase = true;
- if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base))) {
+ if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) {
$belongsToBase = false;
}
if($belongsToBase) {
diff --git a/autotest.cmd b/autotest.cmd
index a511faef9c6..969e4a1ff38 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -6,7 +6,6 @@
::
:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
::
-@echo off
set DATADIR=data-autotest
set BASEDIR=%~dp0
@@ -119,7 +118,8 @@ goto:eof
md coverage-html-%~1
php -f enable_all.php
- php win32-phpunit.php --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
+ call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
+
echo "Done with testing %~1 ..."
cd %BASEDIR%
goto:eof
diff --git a/config/config.sample.php b/config/config.sample.php
index 9a24c9364e0..54dbf3f7c33 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -129,6 +129,12 @@ $CONFIG = array(
/* Are we connected to the internet or are we running in a closed network? */
"has_internet_connection" => true,
+/* Check if the ownCloud WebDAV server is working correctly. Can be disabled if not needed in special situations*/
+"check_for_working_webdav" => true,
+
+/* Check if .htaccess protection of data is working correctly. Can be disabled if not needed in special situations*/
+"check_for_working_htaccess" => true,
+
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
"log_type" => "owncloud",
diff --git a/core/command/db/generatechangescript.php b/core/command/db/generatechangescript.php
new file mode 100644
index 00000000000..f971124cfdc
--- /dev/null
+++ b/core/command/db/generatechangescript.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\Db;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class GenerateChangeScript extends Command {
+ protected function configure() {
+ $this
+ ->setName('db:generate-change-script')
+ ->setDescription('generates the change script from the current connected db to db_structure.xml')
+ ->addArgument(
+ 'schema-xml',
+ InputArgument::OPTIONAL,
+ 'the schema xml to be used as target schema',
+ \OC::$SERVERROOT . '/db_structure.xml'
+ )
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+
+ $file = $input->getArgument('schema-xml');
+
+ $schemaManager = new \OC\DB\MDB2SchemaManager(\OC_DB::getConnection());
+
+ try {
+ $result = $schemaManager->updateDbFromStructure($file, true);
+ $output->writeln($result);
+ } catch (\Exception $e) {
+ $output->writeln('Failed to update database structure ('.$e.')');
+ }
+
+ }
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index b919660779e..62ee0e56cae 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -58,7 +58,9 @@ button, .button,
}
input[type="hidden"] { height:0; width:0; }
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea {
- background:#f8f8f8; color:#555; cursor:text;
+ background: #fff;
+ color: #555;
+ cursor: text;
font-family: inherit; /* use default ownCloud font instead of default textarea monospace */
}
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"] {
@@ -72,7 +74,7 @@ input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:act
input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active,
textarea:hover, textarea:focus, textarea:active {
- background-color:#fff; color:#333;
+ color: #333;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1;
}
input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
@@ -798,7 +800,8 @@ div.crumb {
background: url('../img/breadcrumb.svg') no-repeat right center;
height: 44px;
}
-div.crumb a {
+div.crumb a,
+div.crumb span {
position: relative;
top: 12px;
padding: 14px 24px 14px 17px;
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index e5e9f6dbb7d..a9b40918ca7 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -234,7 +234,7 @@ var OCdialogs = {
var getCroppedPreview = function(file) {
var deferred = new $.Deferred();
// Only process image files.
- var type = file.type.split('/').shift();
+ var type = file.type && file.type.split('/').shift();
if (window.FileReader && type === 'image') {
var reader = new FileReader();
reader.onload = function (e) {
diff --git a/core/js/share.js b/core/js/share.js
index b472797b3cd..6ec15f01c1e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -4,57 +4,76 @@ OC.Share={
SHARE_TYPE_LINK:3,
SHARE_TYPE_EMAIL:4,
itemShares:[],
- statuses:[],
+ statuses:{},
droppedDown:false,
+ /**
+ * Loads ALL share statuses from server, stores them in OC.Share.statuses then
+ * calls OC.Share.updateIcons() to update the files "Share" icon to "Shared"
+ * according to their share status and share type.
+ */
loadIcons:function(itemType) {
// Load all share icons
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
if (result && result.status === 'success') {
+ OC.Share.statuses = {};
$.each(result.data, function(item, data) {
OC.Share.statuses[item] = data;
- var hasLink = data['link'];
- // Links override shared in terms of icon display
- if (hasLink) {
- var image = OC.imagePath('core', 'actions/public');
- } else {
- var image = OC.imagePath('core', 'actions/shared');
- }
- if (itemType != 'file' && itemType != 'folder') {
- $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
- } else {
- var file = $('tr[data-id="'+item+'"]');
- if (file.length > 0) {
- var action = $(file).find('.fileactions .action[data-action="Share"]');
- var img = action.find('img').attr('src', image);
- action.addClass('permanent');
- action.html(' '+t('core', 'Shared')).prepend(img);
- } else {
- var dir = $('#dir').val();
- if (dir.length > 1) {
- var last = '';
- var path = dir;
- // Search for possible parent folders that are shared
- while (path != last) {
- if (path == data['path']) {
- var actions = $('.fileactions .action[data-action="Share"]');
- $.each(actions, function(index, action) {
- var img = $(action).find('img');
- if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
- img.attr('src', image);
- $(action).addClass('permanent');
- $(action).html(' '+t('core', 'Shared')).prepend(img);
- }
- });
+ });
+ OC.Share.updateIcons(itemType);
+ }
+ });
+ },
+ /**
+ * Updates the files' "Share" icons according to the known
+ * sharing states stored in OC.Share.statuses.
+ * (not reloaded from server)
+ */
+ updateIcons:function(itemType){
+ var item;
+ for (item in OC.Share.statuses){
+ var data = OC.Share.statuses[item];
+
+ var hasLink = data['link'];
+ // Links override shared in terms of icon display
+ if (hasLink) {
+ var image = OC.imagePath('core', 'actions/public');
+ } else {
+ var image = OC.imagePath('core', 'actions/shared');
+ }
+ if (itemType != 'file' && itemType != 'folder') {
+ $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+ } else {
+ var file = $('tr[data-id="'+item+'"]');
+ if (file.length > 0) {
+ var action = $(file).find('.fileactions .action[data-action="Share"]');
+ var img = action.find('img').attr('src', image);
+ action.addClass('permanent');
+ action.html(' '+t('core', 'Shared')).prepend(img);
+ } else {
+ var dir = $('#dir').val();
+ if (dir.length > 1) {
+ var last = '';
+ var path = dir;
+ // Search for possible parent folders that are shared
+ while (path != last) {
+ if (path == data['path']) {
+ var actions = $('.fileactions .action[data-action="Share"]');
+ $.each(actions, function(index, action) {
+ var img = $(action).find('img');
+ if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+ img.attr('src', image);
+ $(action).addClass('permanent');
+ $(action).html(' '+t('core', 'Shared')).prepend(img);
}
- last = path;
- path = OC.Share.dirname(path);
- }
+ });
}
+ last = path;
+ path = OC.Share.dirname(path);
}
}
- });
+ }
}
- });
+ }
},
updateIcon:function(itemType, itemSource) {
var shares = false;
@@ -184,7 +203,19 @@ OC.Share={
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
html += '<ul id="shareWithList">';
html += '</ul>';
- if (link) {
+ var linksAllowed = false;
+ $.ajax({
+ type: 'GET',
+ url: OC.filePath('core', 'ajax', 'appconfig.php'),
+ data: { action:'getValue', app:'core', key:'shareapi_allow_links', defaultValue:'yes' },
+ async: false,
+ success: function(result) {
+ if (result && result.status === 'success' && result.data === 'yes') {
+ linksAllowed = true;
+ }
+ }
+ });
+ if (link && linksAllowed) {
html += '<div id="link">';
html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
html += '<br />';
@@ -262,7 +293,7 @@ OC.Share={
// Default permissions are Edit (CRUD) and Share
var permissions = OC.PERMISSION_ALL;
OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
- OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
+ OC.Share.addShareWith(shareType, shareWith, selected.item.value.shareWith, permissions, possiblePermissions);
$('#shareWith').val('');
OC.Share.updateIcon(itemType, itemSource);
});
@@ -303,6 +334,9 @@ OC.Share={
});
},
addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) {
+ if (shareType === 1) {
+ shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
+ }
if (!OC.Share.itemShares[shareType]) {
OC.Share.itemShares[shareType] = [];
}
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 82b93172a1e..7eff85ce6a6 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -96,8 +96,12 @@ $TRANSLATIONS = array(
"Email sent" => "Email envoyé",
"Warning" => "Attention",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
+"Enter new" => "Saisir un nouveau",
"Delete" => "Supprimer",
"Add" => "Ajouter",
+"Edit tags" => "Modifier les balises",
+"Error loading dialog template: {error}" => "Erreur de chargement du modèle de dialogue : {error}",
+"No tags selected for deletion." => "Aucune balise sélectionnée pour la suppression.",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
"%s password reset" => "Réinitialisation de votre mot de passe %s",
@@ -118,6 +122,13 @@ $TRANSLATIONS = array(
"Apps" => "Applications",
"Admin" => "Administration",
"Help" => "Aide",
+"Error loading tags" => "Erreur de chargement des balises.",
+"Tag already exists" => "La balise existe déjà.",
+"Error deleting tag(s)" => "Erreur de suppression de(s) balise(s)",
+"Error tagging" => "Erreur lors de la mise en place de la balise",
+"Error untagging" => "Erreur lors de la suppression de la balise",
+"Error favoriting" => "Erreur lors de la mise en favori",
+"Error unfavoriting" => "Erreur lors de la suppression des favoris",
"Access forbidden" => "Accès interdit",
"Cloud not found" => "Introuvable",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nJuste pour vous signaler que %s a partagé %s avec vous.\nConsultez-le : %s\n",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index f2d9d1ba22a..4985edf0378 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«",
+"Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
"group" => "csoport",
"Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
"Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
@@ -34,13 +35,13 @@ $TRANSLATIONS = array(
"December" => "december",
"Settings" => "Beállítások",
"seconds ago" => "pár másodperce",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n perccel ezelőtt","%n perccel ezelőtt"),
+"_%n hour ago_::_%n hours ago_" => array("%n órával ezelőtt","%n órával ezelőtt"),
"today" => "ma",
"yesterday" => "tegnap",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n nappal ezelőtt","%n nappal ezelőtt"),
"last month" => "múlt hónapban",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
@@ -50,7 +51,7 @@ $TRANSLATIONS = array(
"No" => "Nem",
"Ok" => "Ok",
"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
"One file conflict" => "Egy file ütközik",
"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?",
"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.",
@@ -81,6 +82,7 @@ $TRANSLATIONS = array(
"Resharing is not allowed" => "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
"Shared in {item} with {user}" => "Megosztva {item}-ben {user}-rel",
"Unshare" => "A megosztás visszavonása",
+"notify user by email" => "felhasználó értesítése e-mailben",
"can edit" => "módosíthat",
"access control" => "jogosultság",
"create" => "létrehoz",
@@ -94,8 +96,12 @@ $TRANSLATIONS = array(
"Email sent" => "Az emailt elküldtük",
"Warning" => "Figyelmeztetés",
"The object type is not specified." => "Az objektum típusa nincs megadva.",
+"Enter new" => "Új beírása",
"Delete" => "Törlés",
"Add" => "Hozzáadás",
+"Edit tags" => "Címkék szerkesztése",
+"Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
+"No tags selected for deletion." => "Nincs törlésre kijelölt címke.",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
"%s password reset" => "%s jelszó visszaállítás",
@@ -116,8 +122,18 @@ $TRANSLATIONS = array(
"Apps" => "Alkalmazások",
"Admin" => "Adminsztráció",
"Help" => "Súgó",
+"Error loading tags" => "Hiba a címkék betöltésekor",
+"Tag already exists" => "A címke már létezik",
+"Error deleting tag(s)" => "Hiba a címkék törlésekor",
+"Error tagging" => "Hiba a címkézéskor",
+"Error untagging" => "Hiba a címkék eltávolításakor",
+"Error favoriting" => "Hiba a kedvencekhez adáskor",
+"Error unfavoriting" => "Hiba a kedvencekből törléskor",
"Access forbidden" => "A hozzáférés nem engedélyezett",
"Cloud not found" => "A felhő nem található",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n",
+"The share will expire on %s.\n\n" => "A megosztás ekkor jár le: %s\\n\n\\n",
+"Cheers!" => "Üdv.",
"Security Warning" => "Biztonsági figyelmeztetés",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
"Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
@@ -136,15 +152,20 @@ $TRANSLATIONS = array(
"Database tablespace" => "Az adatbázis táblázattér (tablespace)",
"Database host" => "Adatbázis szerver",
"Finish setup" => "A beállítások befejezése",
+"Finishing …" => "Befejezés ...",
"%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
"Log out" => "Kilépés",
"Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
"If you did not change your password recently, your account may be compromised!" => "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!",
"Please change your password to secure your account again." => "A biztonsága érdekében változtassa meg a jelszavát!",
+"Server side authentication failed!" => "A szerveroldali hitelesítés sikertelen!",
+"Please contact your administrator." => "Kérjük, lépjen kapcsolatba a rendszergazdával.",
"Lost your password?" => "Elfelejtette a jelszavát?",
"remember" => "emlékezzen",
"Log in" => "Bejelentkezés",
"Alternative Logins" => "Alternatív bejelentkezés",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>",
+"The share will expire on %s.<br><br>" => "A megosztás ekkor jár le: %s<br><br>",
"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1cb1a39c743..dead0fab87c 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -96,8 +96,12 @@ $TRANSLATIONS = array(
"Email sent" => "Messaggio inviato",
"Warning" => "Avviso",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
+"Enter new" => "Inserisci nuovo",
"Delete" => "Elimina",
"Add" => "Aggiungi",
+"Edit tags" => "Modifica etichette",
+"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
+"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
"%s password reset" => "Ripristino password di %s",
@@ -118,6 +122,13 @@ $TRANSLATIONS = array(
"Apps" => "Applicazioni",
"Admin" => "Admin",
"Help" => "Aiuto",
+"Error loading tags" => "Errore di caricamento delle etichette",
+"Tag already exists" => "L'etichetta esiste già",
+"Error deleting tag(s)" => "Errore di eliminazione delle etichette",
+"Error tagging" => "Errore di assegnazione delle etichette",
+"Error untagging" => "Errore di rimozione delle etichette",
+"Error favoriting" => "Errore di creazione dei preferiti",
+"Error unfavoriting" => "Errore di rimozione dai preferiti",
"Access forbidden" => "Accesso negato",
"Cloud not found" => "Nuvola non trovata",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
@@ -147,6 +158,8 @@ $TRANSLATIONS = array(
"Automatic logon rejected!" => "Accesso automatico rifiutato.",
"If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
"Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
+"Server side authentication failed!" => "Autenticazione lato server non riuscita!",
+"Please contact your administrator." => "Contatta il tuo amministratore di sistema.",
"Lost your password?" => "Hai perso la password?",
"remember" => "ricorda",
"Log in" => "Accedi",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index b0c519e3a1c..469d75e229e 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Delete" => "削除",
"Add" => "追加",
"Edit tags" => "タグを編集",
+"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
"No tags selected for deletion." => "削除するタグが選択されていません。",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
"The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
@@ -126,9 +127,13 @@ $TRANSLATIONS = array(
"Error deleting tag(s)" => "タグの削除エラー",
"Error tagging" => "タグの付与エラー",
"Error untagging" => "タグの解除エラー",
+"Error favoriting" => "お気に入りに追加エラー",
+"Error unfavoriting" => "お気に入りから削除エラー",
"Access forbidden" => "アクセスが禁止されています",
"Cloud not found" => "見つかりません",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
"The share will expire on %s.\n\n" => "共有は %s で有効期限が切れます。\n\n",
+"Cheers!" => "それでは!",
"Security Warning" => "セキュリティ警告",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
"Please update your PHP installation to use %s securely." => "%s を安全に利用する為に インストールされているPHPをアップデートしてください。",
@@ -159,6 +164,7 @@ $TRANSLATIONS = array(
"remember" => "パスワードを記憶する",
"Log in" => "ログイン",
"Alternative Logins" => "代替ログイン",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
"The share will expire on %s.<br><br>" => "共有は %s で有効期限が切れます。<br><br>",
"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 675471f88e0..5e99d831132 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -96,8 +96,12 @@ $TRANSLATIONS = array(
"Email sent" => "E-mail verzonden",
"Warning" => "Waarschuwing",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
+"Enter new" => "Opgeven nieuw",
"Delete" => "Verwijder",
"Add" => "Toevoegen",
+"Edit tags" => "Bewerken tags",
+"Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
+"No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
"%s password reset" => "%s wachtwoord reset",
@@ -118,6 +122,13 @@ $TRANSLATIONS = array(
"Apps" => "Apps",
"Admin" => "Beheerder",
"Help" => "Help",
+"Error loading tags" => "Fout bij laden tags",
+"Tag already exists" => "Tag bestaat al",
+"Error deleting tag(s)" => "Fout bij verwijderen tag(s)",
+"Error tagging" => "Fout bij taggen",
+"Error untagging" => "Fout bij ont-taggen",
+"Error favoriting" => "Fout bij favoriet maken",
+"Error unfavoriting" => "Fout bij verwijderen favorietstatus",
"Access forbidden" => "Toegang verboden",
"Cloud not found" => "Cloud niet gevonden",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index c14cb718749..b9c1d59c91f 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -50,6 +50,9 @@ $TRANSLATIONS = array(
"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todos seleccionados)",
+"({count} selected)" => "({count} seleccionados)",
"Shared" => "Partilhado",
"Share" => "Partilhar",
"Error" => "Erro",
@@ -72,6 +75,7 @@ $TRANSLATIONS = array(
"Resharing is not allowed" => "Não é permitido partilhar de novo",
"Shared in {item} with {user}" => "Partilhado em {item} com {user}",
"Unshare" => "Deixar de partilhar",
+"notify user by email" => "notificar utilizador por correio electrónico",
"can edit" => "pode editar",
"access control" => "Controlo de acesso",
"create" => "criar",
@@ -127,6 +131,7 @@ $TRANSLATIONS = array(
"Database tablespace" => "Tablespace da base de dados",
"Database host" => "Anfitrião da base de dados",
"Finish setup" => "Acabar instalação",
+"Finishing …" => "A terminar...",
"%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
"Log out" => "Sair",
"Automatic logon rejected!" => "Login automático rejeitado!",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
new file mode 100644
index 00000000000..8a82c09c5b1
--- /dev/null
+++ b/core/l10n/ru_RU.php
@@ -0,0 +1,18 @@
+<?php
+$TRANSLATIONS = array(
+"Settings" => "Настройки",
+"_%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("","",""),
+"Yes" => "Да",
+"No" => "Нет",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Отмена",
+"Share" => "Сделать общим",
+"Error" => "Ошибка",
+"Password" => "Пароль",
+"Warning" => "Предупреждение",
+"Username" => "Имя пользователя"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index db29395a7f6..5aa9b56ec07 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
+"Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
"group" => "skupina",
"Turned on maintenance mode" => "Mód údržby zapnutý",
"Turned off maintenance mode" => "Mód údržby vypnutý",
@@ -8,6 +9,11 @@ $TRANSLATIONS = array(
"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...",
"Updated filecache" => "\"Filecache\" aktualizovaná",
"... %d%% done ..." => "... %d%% dokončených ...",
+"No image or file provided" => "Obrázok alebo súbor nebol zadaný",
+"Unknown filetype" => "Neznámy typ súboru",
+"Invalid image" => "Chybný obrázok",
+"No temporary profile picture available, try again" => "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+"No crop data provided" => "Dáta pre orezanie neboli zadané",
"Sunday" => "Nedeľa",
"Monday" => "Pondelok",
"Tuesday" => "Utorok",
@@ -40,11 +46,19 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "pred rokmi",
"Choose" => "Výber",
+"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
"Yes" => "Áno",
"No" => "Nie",
"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
+"One file conflict" => "Jeden konflikt súboru",
+"Which files do you want to keep?" => "Ktoré súbory chcete ponechať?",
+"If you select both versions, the copied file will have a number added to its name." => "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
"Cancel" => "Zrušiť",
+"Continue" => "Pokračovať",
+"(all selected)" => "(všetko vybrané)",
+"({count} selected)" => "({count} vybraných)",
"Shared" => "Zdieľané",
"Share" => "Zdieľať",
"Error" => "Chyba",
@@ -67,6 +81,7 @@ $TRANSLATIONS = array(
"Resharing is not allowed" => "Zdieľanie už zdieľanej položky nie je povolené",
"Shared in {item} with {user}" => "Zdieľané v {item} s {user}",
"Unshare" => "Zrušiť zdieľanie",
+"notify user by email" => "upozorniť používateľa emailom",
"can edit" => "môže upraviť",
"access control" => "prístupové práva",
"create" => "vytvoriť",
@@ -80,8 +95,12 @@ $TRANSLATIONS = array(
"Email sent" => "Email odoslaný",
"Warning" => "Varovanie",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
+"Enter new" => "Zadať nový",
"Delete" => "Zmazať",
"Add" => "Pridať",
+"Edit tags" => "Upraviť štítky",
+"Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}",
+"No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
"%s password reset" => "reset hesla %s",
@@ -102,8 +121,18 @@ $TRANSLATIONS = array(
"Apps" => "Aplikácie",
"Admin" => "Administrátor",
"Help" => "Pomoc",
+"Error loading tags" => "Chyba pri načítaní štítkov",
+"Tag already exists" => "Štítok už existuje",
+"Error deleting tag(s)" => "Chyba pri mazaní štítka(ov)",
+"Error tagging" => "Chyba pri pridaní štítka",
+"Error untagging" => "Chyba pri odobratí štítka",
+"Error favoriting" => "Chyba pri pridaní do obľúbených",
+"Error unfavoriting" => "Chyba pri odobratí z obľúbených",
"Access forbidden" => "Prístup odmietnutý",
"Cloud not found" => "Nenájdené",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n",
+"The share will expire on %s.\n\n" => "Zdieľanie vyexpiruje %s.\n\n",
+"Cheers!" => "Za zdravie!",
"Security Warning" => "Bezpečnostné varovanie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
@@ -122,15 +151,20 @@ $TRANSLATIONS = array(
"Database tablespace" => "Tabuľkový priestor databázy",
"Database host" => "Server databázy",
"Finish setup" => "Dokončiť inštaláciu",
+"Finishing …" => "Dokončujem...",
"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
"Log out" => "Odhlásiť",
"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
"Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
+"Server side authentication failed!" => "Autentifikácia na serveri zlyhala!",
+"Please contact your administrator." => "Kontaktujte prosím vášho administrátora.",
"Lost your password?" => "Zabudli ste heslo?",
"remember" => "zapamätať",
"Log in" => "Prihlásiť sa",
"Alternative Logins" => "Alternatívne prihlasovanie",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>",
+"The share will expire on %s.<br><br>" => "Zdieľanie vyexpiruje %s.<br><br>",
"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 239b9495ef3..e89ab9d85e8 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -96,6 +96,7 @@ $TRANSLATIONS = array(
"Email sent" => "E-post skickat",
"Warning" => "Varning",
"The object type is not specified." => "Objekttypen är inte specificerad.",
+"Enter new" => "Skriv nytt",
"Delete" => "Radera",
"Add" => "Lägg till",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
@@ -118,6 +119,7 @@ $TRANSLATIONS = array(
"Apps" => "Program",
"Admin" => "Admin",
"Help" => "Hjälp",
+"Error favoriting" => "Fel favorisering",
"Access forbidden" => "Åtkomst förbjuden",
"Cloud not found" => "Hittade inget moln",
"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n",
diff --git a/core/register_command.php b/core/register_command.php
index 1eed347b7b5..683e7ae1833 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -6,4 +6,6 @@
* See the COPYING-README file.
*/
+/** @var $application Symfony\Component\Console\Application */
$application->add(new OC\Core\Command\Status);
+$application->add(new OC\Core\Command\Db\GenerateChangeScript());
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d30313a67cc..9e1d8022ecb 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -8,9 +8,10 @@
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
- <?php p(!empty($_['application'])?$_['application'].' | ':'');
- p($theme->getTitle());
- p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
+ <?php
+ p(!empty($_['application'])?$_['application'].' - ':'');
+ p($theme->getTitle());
+ ?>
</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index efa6747b0fb..7c60d49cd4e 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-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ady/lib.po b/l10n/ady/lib.po
index 94fa2ed8df7..1160c589d35 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-07 12:17-0400\n"
-"PO-Revision-Date: 2013-10-07 15:03+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index f9ccab1475b..d8b3b33ffd0 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hulp"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persoonlik"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Instellings"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Gebruikers"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 3e6132a904a..39e3550ee44 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "المساعدة"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "شخصي"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "إعدادات"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "المستخدمين"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "المدير"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index cba5a16eb98..f24674cd709 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,270 +17,278 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -288,7 +296,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -296,15 +304,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -312,11 +320,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -324,19 +332,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 9dd30883bc5..11ce55527e5 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Помощ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Лични"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Настройки"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Потребители"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Админ"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index ddbd1f73279..52c5cf92c4d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "সহায়িকা"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "ব্যক্তিগত"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "ব্যবহারকারী"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "প্রশাসন"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 721908ee79a..cae0b70cc31 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,322 +17,325 @@ msgstr ""
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ca/lib.po b/l10n/ca/lib.po
index 54df775184f..00f9fa009c3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "L'aplicació \"%s\" no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "No heu especificat cap nom d'aplicació"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ajuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Configuració"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usuaris"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administració"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ha fallat l'actualització \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Les imatges de perfil personals encara no funcionen amb encriptació"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tipus de fitxer desconegut"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imatge no vàlida"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index af055391e77..c8dfc1f8e6e 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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-15 19:46+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -56,15 +56,11 @@ msgstr "Administrace"
msgid "Failed to upgrade \"%s\"."
msgstr "Selhala aktualizace verze \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Vlastní profilové obrázky zatím nefungují v kombinaci se šifrováním"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Neznámý typ souboru"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Chybný obrázek"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 40e5844db99..723c008a823 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Cymorth"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personol"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Gosodiadau"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Defnyddwyr"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Gweinyddu"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 14c6ec889b6..91b521e1d9d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -20,51 +20,47 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Intet app-navn angivet"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hjælp"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personligt"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Indstillinger"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Brugere"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgradering af \"%s\" fejlede"
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Personligt profilbillede virker endnu ikke sammen med kryptering"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Ukendt filtype"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ugyldigt billede"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index cef3adec633..b00ec24603c 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -11,61 +11,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Es wurde kein Applikation-Name angegeben"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hilfe"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persönlich"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Einstellungen"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Benutzer"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administration"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Unbekannter Dateityp"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ungültiges Bild"
@@ -299,13 +295,13 @@ msgstr "Gerade eben"
#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
#: private/template/functions.php:125
@@ -319,7 +315,7 @@ msgstr "Gestern"
#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
#: private/template/functions.php:130
@@ -329,7 +325,7 @@ msgstr "Letzten Monat"
#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
#: private/template/functions.php:133
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index bf22f6eccdd..be8b6f27a96 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -8,13 +8,14 @@
# ninov <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 14:12+0000\n"
+"Last-Translator: kabum <uu.kabum@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -245,7 +246,7 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr "Bitte überprüfe die <a href=\"%s\">Instalationsanleitungen</a>."
+msgstr "Bitte überprüfe die <a href=\"%s\">Installationsanleitungen</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 7f3e0eafd04..c08f173a6cb 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/de_CH/lib.po b/l10n/de_CH/lib.po
index 0125f27f4fe..6da6000fe91 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -21,51 +21,47 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Anwendung \"%s\" kann nicht installiert werden, da sie mit dieser Version von ownCloud nicht kompatibel ist."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Kein App-Name spezifiziert"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hilfe"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persönlich"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Einstellungen"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Benutzer"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrator"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 18a5ff6232a..fceb06783fa 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -10,61 +10,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
-"Language-Team: German (Germany) <translations@owncloud.org>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Es wurde kein Applikation-Name angegeben"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hilfe"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persönlich"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Einstellungen"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Benutzer"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrator"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Unbekannter Dateityp"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ungültiges Bild"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 21de2bf03be..4decc76e4ec 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Βοήθεια"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Προσωπικά"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Χρήστες"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Διαχειριστής"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Αποτυχία αναβάθμισης του \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 53ee952f616..e6812184889 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr "web services under your control"
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/en_GB/lib.po b/l10n/en_GB/lib.po
index ec486461596..02ac1254c69 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "No app name specified"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Help"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Settings"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Users"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Failed to upgrade \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Custom profile pictures don't work with encryption yet"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Unknown filetype"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Invalid image"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 3c339b239ce..394829c40a1 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Helpo"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persona"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Agordo"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Uzantoj"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administranto"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index c4da9c540a1..c916353dee3 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-03 16:30+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -21,51 +21,47 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "No se ha especificado nombre de la aplicación"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ayuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Ajustes"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usuarios"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administración"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falló la actualización \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Las imágenes de perfil personalizadas no funcionan con el cifrado aún"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tipo de archivo desconocido"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imagen inválida"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 066f0111fa6..ce150608c9d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "No fue especificado el nombre de la app"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ayuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Configuración"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usuarios"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administración"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "No se pudo actualizar \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index 7861d1b4836..1823a00e415 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-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/et_EE/lib.po b/l10n/et_EE/lib.po
index 282b7282180..6e2b050fade 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -19,51 +19,47 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Ühegi rakendi nime pole määratletud"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Abiinfo"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Isiklik"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Seaded"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Kasutajad"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ebaõnnestunud uuendus \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tundmatu failitüüp"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Vigane pilt"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index b082cae4de3..41d87b35cfa 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:42+0000\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-17 21:10+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -133,11 +133,11 @@ msgstr "Palun oota..."
#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr "Viga rakendi keelamisel"
+msgstr "Viga rakenduse keelamisel"
#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr "Viga rakendi lubamisel"
+msgstr "Viga rakenduse lubamisel"
#: js/apps.js:125
msgid "Updating...."
@@ -285,7 +285,7 @@ msgstr "Cron"
#: templates/admin.php:99
msgid "Execute one task with each page loaded"
-msgstr "Käivita toiming lehe laadimisel"
+msgstr "Käivita toiming igal lehe laadimisel"
#: templates/admin.php:107
msgid ""
@@ -503,7 +503,7 @@ msgstr "Profiili pilt"
#: templates/personal.php:90
msgid "Upload new"
-msgstr "Laadi uus"
+msgstr "Laadi uus üles"
#: templates/personal.php:92
msgid "Select new from Files"
@@ -515,7 +515,7 @@ msgstr "Eemalda pilt"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata."
+msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata."
#: templates/personal.php:97
msgid "Abort"
@@ -523,7 +523,7 @@ msgstr "Katkesta"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr "Vali kui profiili pilt"
+msgstr "Vali profiilipildiks"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
@@ -570,7 +570,7 @@ msgstr "Lisa"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr "Admin taasteparool"
+msgstr "Admini parooli taastamine"
#: templates/users.php:37 templates/users.php:38
msgid ""
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 7a64a4d3f4e..9fbed2cfc97 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -19,51 +19,47 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Laguntza"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Pertsonala"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Ezarpenak"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Erabiltzaileak"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ezin izan da \"%s\" eguneratu."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index c324c0ab23a..3ade453de50 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "راه‌نما"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "شخصی"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "تنظیمات"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "کاربران"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "مدیر"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 054b3f11568..a038cbb328a 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Sovelluksen nimeä ei määritelty"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ohje"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Henkilökohtainen"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Asetukset"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Käyttäjät"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Ylläpitäjä"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Kohteen \"%s\" päivitys epäonnistui."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tuntematon tiedostotyyppi"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Virheellinen kuva"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index e6861f38edb..8db354702f5 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 11:40+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,7 @@ msgstr "%s partagé »%s« avec vous"
msgid "Couldn't send mail to following users: %s "
msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr "groupe"
@@ -279,144 +279,144 @@ msgstr "({count} sélectionnés)"
msgid "Error loading file exists template"
msgstr "Erreur de chargement du modèle de fichier existant"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Partagé"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Partager"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr "Erreur"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Erreur lors de l'annulation du partage"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Erreur lors du changement des permissions"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partagé par {owner} avec vous et le groupe {group}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Partagé avec vous par {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Partager avec"
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr "Partager via lien"
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Mot de passe"
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr "Envoyez le lien par email"
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr "Envoyer"
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr "Spécifier la date d'expiration"
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
msgstr "Prévenir l'utilisateur par couriel"
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr "créer"
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr "supprimer"
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr "partager"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr "Email envoyé"
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr "Attention"
@@ -426,7 +426,7 @@ msgstr "Le type d'objet n'est pas spécifié."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Saisir un nouveau"
#: js/tags.js:27
msgid "Delete"
@@ -438,15 +438,15 @@ msgstr "Ajouter"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "Modifier les balises"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Erreur de chargement du modèle de dialogue : {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Aucune balise sélectionnée pour la suppression."
#: js/update.js:17
msgid ""
@@ -528,7 +528,7 @@ msgstr "Personnel"
msgid "Users"
msgstr "Utilisateurs"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Applications"
@@ -542,31 +542,31 @@ msgstr "Aide"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Erreur de chargement des balises."
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "La balise existe déjà."
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Erreur de suppression de(s) balise(s)"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Erreur lors de la mise en place de la balise"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "Erreur lors de la suppression de la balise"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Erreur lors de la mise en favori"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "Erreur lors de la suppression des favoris"
#: templates/403.php:12
msgid "Access forbidden"
@@ -686,12 +686,12 @@ msgstr "Terminer l'installation"
msgid "Finishing …"
msgstr "En cours de finalisation..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Se déconnecter"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index a0467819d8e..1ff30fe4dc4 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -20,51 +20,47 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Aucun nom d'application spécifié"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Aide"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personnel"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Paramètres"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Utilisateurs"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administration"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Echec de la mise à niveau \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement."
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Type de fichier inconnu"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Image invalide"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 53df3e297f9..a287639ec19 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Non se especificou o nome do aplicativo"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Axuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persoal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Axustes"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usuarios"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administración"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Non foi posíbel anovar «%s»."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "As imaxes personalizadas de perfil aínda non funcionan co cifrado"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tipo de ficheiro descoñecido"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imaxe incorrecta"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 84498606248..ec52c8fb63c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "עזרה"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "אישי"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "הגדרות"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "משתמשים"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "מנהל"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 2828479f62f..a566f1546eb 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "सहयोग"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "यक्तिगत"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "सेटिंग्स"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "उपयोगकर्ता"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index b3008a4540a..26fffa35247 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pomoć"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Osobno"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Postavke"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Korisnici"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrator"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 89209ca2153..c239ec717f0 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# sherlock79 <david@interpont.hu>, 2013
# ebela <bela@dandre.hu>, 2013
# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 19:30+0000\n"
+"Last-Translator: sherlock79 <david@interpont.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,9 +28,9 @@ msgstr "%s megosztotta Önnel ezt: »%s«"
#: ajax/share.php:168
#, php-format
msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr "csoport"
@@ -165,14 +166,14 @@ msgstr "pár másodperce"
#: js/js.js:859
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n perccel ezelőtt"
+msgstr[1] "%n perccel ezelőtt"
#: js/js.js:860
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n órával ezelőtt"
+msgstr[1] "%n órával ezelőtt"
#: js/js.js:861
msgid "today"
@@ -185,8 +186,8 @@ msgstr "tegnap"
#: js/js.js:863
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n nappal ezelőtt"
+msgstr[1] "%n nappal ezelőtt"
#: js/js.js:864
msgid "last month"
@@ -195,8 +196,8 @@ msgstr "múlt hónapban"
#: js/js.js:865
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n hónappal ezelőtt"
+msgstr[1] "%n hónappal ezelőtt"
#: js/js.js:866
msgid "months ago"
@@ -237,8 +238,8 @@ msgstr "Nem sikerült betölteni az üzenet sablont: {error}"
#: js/oc-dialogs.js:347
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} fájl ütközik"
+msgstr[1] "{count} fájl ütközik"
#: js/oc-dialogs.js:361
msgid "One file conflict"
@@ -274,144 +275,144 @@ msgstr "({count} kiválasztva)"
msgid "Error loading file exists template"
msgstr "Hiba a létező sablon betöltésekor"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Megosztott"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr "Hiba"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Nem sikerült visszavonni a megosztást"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Nem sikerült módosítani a jogosultságokat"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Megosztotta Önnel: {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Kivel osztom meg"
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr "Link megadásával osztom meg"
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Jelszó"
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "Feltöltést is engedélyezek"
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr "Email címre küldjük el"
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr "Küldjük el"
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr "Legyen lejárati idő"
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
-msgstr ""
+msgstr "felhasználó értesítése e-mailben"
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr "létrehoz"
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr "töröl"
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr "megoszt"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr "Az emailt elküldtük"
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr "Figyelmeztetés"
@@ -421,7 +422,7 @@ msgstr "Az objektum típusa nincs megadva."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Új beírása"
#: js/tags.js:27
msgid "Delete"
@@ -433,15 +434,15 @@ msgstr "Hozzáadás"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "Címkék szerkesztése"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Hiba a párbeszédpanel-sablon betöltésekor: {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Nincs törlésre kijelölt címke."
#: js/update.js:17
msgid ""
@@ -523,7 +524,7 @@ msgstr "Személyes"
msgid "Users"
msgstr "Felhasználók"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Alkalmazások"
@@ -537,31 +538,31 @@ msgstr "Súgó"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Hiba a címkék betöltésekor"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "A címke már létezik"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Hiba a címkék törlésekor"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Hiba a címkézéskor"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "Hiba a címkék eltávolításakor"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Hiba a kedvencekhez adáskor"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "Hiba a kedvencekből törléskor"
#: templates/403.php:12
msgid "Access forbidden"
@@ -579,18 +580,18 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr ""
+msgstr "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n"
#: templates/altmail.php:4
#, php-format
msgid ""
"The share will expire on %s.\n"
"\n"
-msgstr ""
+msgstr "A megosztás ekkor jár le: %s\\n\n\\n"
#: templates/altmail.php:6 templates/mail.php:19
msgid "Cheers!"
-msgstr ""
+msgstr "Üdv."
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -679,14 +680,14 @@ msgstr "A beállítások befejezése"
#: templates/installation.php:184
msgid "Finishing …"
-msgstr ""
+msgstr "Befejezés ..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Kilépés"
@@ -706,11 +707,11 @@ msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
#: templates/login.php:17
msgid "Server side authentication failed!"
-msgstr ""
+msgstr "A szerveroldali hitelesítés sikertelen!"
#: templates/login.php:18
msgid "Please contact your administrator."
-msgstr ""
+msgstr "Kérjük, lépjen kapcsolatba a rendszergazdával."
#: templates/login.php:38
msgid "Lost your password?"
@@ -733,12 +734,12 @@ msgstr "Alternatív bejelentkezés"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>"
#: templates/mail.php:17
#, php-format
msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "A megosztás ekkor jár le: %s<br><br>"
#: templates/update.php:3
#, php-format
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index e44f550050f..611dd5155f4 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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 19:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -28,62 +28,62 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
msgid "Could not move %s"
msgstr "Nem sikerült %s áthelyezése"
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/upload.php:18 ajax/upload.php:50
msgid "Unable to set upload directory."
msgstr "Nem található a mappa, ahova feltölteni szeretne."
-#: ajax/upload.php:22
+#: ajax/upload.php:27
msgid "Invalid Token"
msgstr "Hibás mappacím"
-#: ajax/upload.php:59
+#: ajax/upload.php:64
msgid "No file was uploaded. Unknown error"
msgstr "Nem történt feltöltés. Ismeretlen hiba"
-#: ajax/upload.php:66
+#: ajax/upload.php:71
msgid "There is no error, the file uploaded with success"
msgstr "A fájlt sikerült feltölteni"
-#: ajax/upload.php:67
+#: ajax/upload.php:72
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét."
-#: ajax/upload.php:69
+#: ajax/upload.php:74
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra."
-#: ajax/upload.php:70
+#: ajax/upload.php:75
msgid "The uploaded file was only partially uploaded"
msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
-#: ajax/upload.php:71
+#: ajax/upload.php:76
msgid "No file was uploaded"
msgstr "Nem töltődött fel állomány"
-#: ajax/upload.php:72
+#: ajax/upload.php:77
msgid "Missing a temporary folder"
msgstr "Hiányzik egy ideiglenes mappa"
-#: ajax/upload.php:73
+#: ajax/upload.php:78
msgid "Failed to write to disk"
msgstr "Nem sikerült a lemezre történő írás"
-#: ajax/upload.php:91
+#: ajax/upload.php:96
msgid "Not enough storage available"
msgstr "Nincs elég szabad hely."
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
msgid "Upload failed. Could not get file info."
msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
-#: ajax/upload.php:138
+#: ajax/upload.php:143
msgid "Upload failed. Could not find uploaded file"
msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány."
-#: ajax/upload.php:165
+#: ajax/upload.php:170
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
@@ -91,52 +91,52 @@ msgstr "Érvénytelen mappa."
msgid "Files"
msgstr "Fájlok"
-#: js/file-upload.js:224
+#: js/file-upload.js:228
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll."
-#: js/file-upload.js:235
+#: js/file-upload.js:239
msgid "Not enough space available"
msgstr "Nincs elég szabad hely"
-#: js/file-upload.js:302
+#: js/file-upload.js:306
msgid "Upload cancelled."
msgstr "A feltöltést megszakítottuk."
-#: js/file-upload.js:336
+#: js/file-upload.js:340
msgid "Could not get result from server."
msgstr "A kiszolgálótól nem kapható meg az eredmény."
-#: js/file-upload.js:426
+#: js/file-upload.js:430
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
-#: js/file-upload.js:500
+#: js/file-upload.js:504
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
-#: js/file-upload.js:505 lib/app.php:53
+#: js/file-upload.js:509 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
+#: js/file-upload.js:544 js/file-upload.js:560 js/files.js:518 js/files.js:556
msgid "Error"
msgstr "Hiba"
-#: js/fileactions.js:119
+#: js/fileactions.js:125
msgid "Share"
msgstr "Megosztás"
-#: js/fileactions.js:131
+#: js/fileactions.js:137
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/fileactions.js:184
+#: js/fileactions.js:194
msgid "Rename"
msgstr "Átnevezés"
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:797
msgid "Pending"
msgstr "Folyamatban"
@@ -180,7 +180,7 @@ msgstr[1] "%n állomány"
msgid "{dirs} and {files}"
msgstr "{dirs} és {files}"
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:736 js/filelist.js:774
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n állomány feltöltése"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 1d76c543806..309b78d26df 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# sherlock79 <david@interpont.hu>, 2013
# ebela <bela@dandre.hu>, 2013
# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 20:00+0000\n"
+"Last-Translator: sherlock79 <david@interpont.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +20,47 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "A(z) \"%s\" alkalmazást nem lehet telepíteni, mert nem kompatibilis az ownCloud telepített verziójával."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Nincs az alkalmazás név megadva."
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Súgó"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Személyes"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Beállítások"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Felhasználók"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Adminsztráció"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Sikertelen Frissítés \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Ismeretlen file tipús"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Hibás kép"
@@ -100,24 +97,24 @@ msgstr "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a
#: private/installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Az alkalmazás telepítéséhez nincs forrás megadva"
#: private/installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva"
#: private/installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva"
#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "A(z) %s típusú tömörített állomány nem támogatott"
#: private/installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Nem sikerült megnyitni a tömörített állományt a telepítés során"
#: private/installer.php:125
msgid "App does not provide an info.xml file"
@@ -125,7 +122,7 @@ msgstr "Az alkalmazás nem szolgáltatott info.xml file-t"
#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel"
#: private/installer.php:140
msgid ""
@@ -137,13 +134,13 @@ msgstr "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett"
#: private/installer.php: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 "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-áruházban feltüntetett verzióval."
#: private/installer.php:162
msgid "App directory already exists"
@@ -298,13 +295,13 @@ msgstr "pár másodperce"
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n perccel ezelőtt"
#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n órával ezelőtt"
+msgstr[1] "%n órával ezelőtt"
#: private/template/functions.php:125
msgid "today"
@@ -317,8 +314,8 @@ msgstr "tegnap"
#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n nappal ezelőtt"
+msgstr[1] "%n nappal ezelőtt"
#: private/template/functions.php:130
msgid "last month"
@@ -327,8 +324,8 @@ msgstr "múlt hónapban"
#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n hónappal ezelőtt"
+msgstr[1] "%n hónappal ezelőtt"
#: private/template/functions.php:133
msgid "last year"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index bc8739cd62d..c608b4dd6e4 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -4,15 +4,16 @@
#
# Translators:
# Adam Toth <adazlord@gmail.com>, 2013
+# sherlock79 <david@interpont.hu>, 2013
# ebela <bela@dandre.hu>, 2013
# Laszlo Tornoci <torlasz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 19:10+0000\n"
+"Last-Translator: sherlock79 <david@interpont.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -345,11 +346,11 @@ msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikke
#: templates/admin.php:170
msgid "Allow mail notification"
-msgstr ""
+msgstr "E-mail értesítések engedélyezése"
#: templates/admin.php:171
msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Engedélyezi, hogy a felhasználók e-mail értesítést küldhessenek a megosztott fájlokról."
#: templates/admin.php:178
msgid "Security"
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index d1e8def17c4..16d2817b050 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ia/lib.po b/l10n/ia/lib.po
index 1ef496076d3..818124c8ad7 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Adjuta"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Configurationes"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usatores"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administration"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index d4e1979c03f..2ef4228da6a 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Bantuan"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Pribadi"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Setelan"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Pengguna"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 4042e96b859..62df7fc223d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hjálp"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Um mig"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Stillingar"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Notendur"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Stjórnun"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 10c7a4626bd..feb25c2c510 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-17 18:30+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "%s ha condiviso «%s» con te"
msgid "Couldn't send mail to following users: %s "
msgstr "Impossibile inviare email ai seguenti utenti: %s"
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr "gruppo"
@@ -276,144 +276,144 @@ msgstr "({count} selezionati)"
msgid "Error loading file exists template"
msgstr "Errore durante il caricamento del modello del file esistente"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Condivisi"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Condividi"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr "Errore"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Errore durante la rimozione della condivisione"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Errore durante la modifica dei permessi"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Condiviso con te e con il gruppo {group} da {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Condiviso con te da {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Condividi con"
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr "Condividi con collegamento"
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Password"
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "Consenti caricamento pubblico"
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr "Invia collegamento via email"
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr "Invia"
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr "Imposta data di scadenza"
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
msgstr "notifica l'utente tramite email"
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr "creare"
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr "aggiornare"
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr "elimina"
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr "condividi"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr "Messaggio inviato"
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr "Avviso"
@@ -423,7 +423,7 @@ msgstr "Il tipo di oggetto non è specificato."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Inserisci nuovo"
#: js/tags.js:27
msgid "Delete"
@@ -435,15 +435,15 @@ msgstr "Aggiungi"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "Modifica etichette"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Errore durante il caricamento del modello di finestra: {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Nessuna etichetta selezionata per l'eliminazione."
#: js/update.js:17
msgid ""
@@ -525,7 +525,7 @@ msgstr "Personale"
msgid "Users"
msgstr "Utenti"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Applicazioni"
@@ -539,31 +539,31 @@ msgstr "Aiuto"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Errore di caricamento delle etichette"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "L'etichetta esiste già"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Errore di eliminazione delle etichette"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Errore di assegnazione delle etichette"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "Errore di rimozione delle etichette"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Errore di creazione dei preferiti"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "Errore di rimozione dai preferiti"
#: templates/403.php:12
msgid "Access forbidden"
@@ -683,12 +683,12 @@ msgstr "Termina la configurazione"
msgid "Finishing …"
msgstr "Completamento..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
-#: templates/layout.user.php:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Esci"
@@ -708,11 +708,11 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
#: templates/login.php:17
msgid "Server side authentication failed!"
-msgstr ""
+msgstr "Autenticazione lato server non riuscita!"
#: templates/login.php:18
msgid "Please contact your administrator."
-msgstr ""
+msgstr "Contatta il tuo amministratore di sistema."
#: templates/login.php:38
msgid "Lost your password?"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 823ed4a1b60..58d3a541f57 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-10-13 20:29-0400\n"
-"PO-Revision-Date: 2013-10-14 00:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-17 18:40+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +61,7 @@ msgid ""
"Encryption app not initialized! Maybe the encryption app was re-enabled "
"during your session. Please try to log out and log back in to initialize the"
" encryption app."
-msgstr ""
+msgstr "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla."
#: files/error.php:15
msgid ""
@@ -75,13 +75,13 @@ msgstr "La chiave privata non è valida! Forse la password è stata cambiata est
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr ""
+msgstr "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te."
#: files/error.php:21 files/error.php:26
msgid ""
"Unknown error please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore"
#: hooks/hooks.php:53
msgid "Missing requirements."
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 634898776d9..06d34712271 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -20,51 +20,47 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Il nome dell'applicazione non è specificato"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Aiuto"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personale"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Impostazioni"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Utenti"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Aggiornamento non riuscito \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tipo di file sconosciuto"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Immagine non valida"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index f802734277b..731c12d9c7c 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/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-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-17 18:40+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -370,11 +370,11 @@ msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'
#: templates/settings.php:103
msgid "UUID Attribute for Users:"
-msgstr ""
+msgstr "Attributo UUID per gli utenti:"
#: templates/settings.php:104
msgid "UUID Attribute for Groups:"
-msgstr ""
+msgstr "Attributo UUID per i gruppi:"
#: templates/settings.php:105
msgid "Username-LDAP User Mapping"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index ae31951408b..2b970733392 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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-16 04:11+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-19 06: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +31,7 @@ msgstr "%sが あなたと »%s«を共有しました"
msgid "Couldn't send mail to following users: %s "
msgstr "次のユーザにメールを送信できませんでした: %s"
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr "グループ"
@@ -271,144 +271,144 @@ msgstr "({count} 選択)"
msgid "Error loading file exists template"
msgstr "既存ファイルのテンプレートの読み込みエラー"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "共有中"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "共有"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr "エラー"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr "共有でエラー発生"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "共有解除でエラー発生"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "権限変更でエラー発生"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "あなたと {owner} のグループ {group} で共有中"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "{owner} と共有中"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "共有者"
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr "URLリンクで共有"
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "パスワード"
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "アップロードを許可"
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr "メールリンク"
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr "送信"
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr "有効期限を設定"
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
msgstr "ユーザにメールで通知"
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr "編集可能"
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr "作成"
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr "更新"
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr "削除"
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr "共有"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr "メールを送信しました"
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr "警告"
@@ -434,7 +434,7 @@ msgstr "タグを編集"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "メッセージテンプレートの読み込みエラー: {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
@@ -520,7 +520,7 @@ msgstr "個人"
msgid "Users"
msgstr "ユーザ"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "アプリ"
@@ -554,11 +554,11 @@ msgstr "タグの解除エラー"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "お気に入りに追加エラー"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "お気に入りから削除エラー"
#: templates/403.php:12
msgid "Access forbidden"
@@ -576,7 +576,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr ""
+msgstr "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n"
#: templates/altmail.php:4
#, php-format
@@ -587,7 +587,7 @@ msgstr "共有は %s で有効期限が切れます。\n\n"
#: templates/altmail.php:6 templates/mail.php:19
msgid "Cheers!"
-msgstr ""
+msgstr "それでは!"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -678,12 +678,12 @@ msgstr "セットアップを完了します"
msgid "Finishing …"
msgstr "終了しています ..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
-#: templates/layout.user.php:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "ログアウト"
@@ -730,7 +730,7 @@ msgstr "代替ログイン"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>"
#: templates/mail.php:17
#, php-format
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 76ee316f13c..9621652dbe9 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.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-10-13 20:29-0400\n"
-"PO-Revision-Date: 2013-10-14 00:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-19 05:50+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +61,7 @@ msgid ""
"Encryption app not initialized! Maybe the encryption app was re-enabled "
"during your session. Please try to log out and log back in to initialize the"
" encryption app."
-msgstr ""
+msgstr "暗号化アプリが初期化されていません。暗号化アプリが接続中に再度有効かされた可能性があります。暗号化アプリを初期化する為に、1回ログアウトしてログインしなおしてください。"
#: files/error.php:15
msgid ""
@@ -75,13 +75,13 @@ msgstr "秘密鍵が有効ではありません。パスワードがownCloudシ
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr ""
+msgstr "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。"
#: files/error.php:21 files/error.php:26
msgid ""
"Unknown error please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。"
#: hooks/hooks.php:53
msgid "Missing requirements."
@@ -104,7 +104,7 @@ msgstr "保存中..."
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
-msgstr ""
+msgstr "あなたのディレクトリへ"
#: templates/invalid_private_key.php:8
msgid "personal settings"
@@ -125,7 +125,7 @@ msgstr "復旧キーのパスワード"
#: templates/settings-admin.php:14
msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "復旧キーのパスワードをもう一度入力"
#: templates/settings-admin.php:21 templates/settings-personal.php:51
msgid "Enabled"
@@ -149,7 +149,7 @@ msgstr "新しい復旧キーのパスワード"
#: templates/settings-admin.php:53
msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "新しい復旧キーのパスワードをもう一度入力"
#: templates/settings-admin.php:58
msgid "Change Password"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 6607afad7bb..33fb995d81e 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -21,51 +21,47 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。"
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "アプリ名が未指定"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "ヘルプ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "個人"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "設定"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "ユーザ"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "管理"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" へのアップグレードに失敗しました。"
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "暗号無しでは利用不可なカスタムプロフィール画像"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "不明なファイルタイプ"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "無効な画像"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index c9960a69dad..dfab915a809 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "შველა"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "პერსონა"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "მომხმარებლები"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 98d50447b36..727a202d5a0 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "დახმარება"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "პირადი"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "პარამეტრები"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "მომხმარებელი"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index 9937427d825..7c7bbdabe26 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,314 +17,317 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/kn/lib.po b/l10n/kn/lib.po
index c760138d383..7129a569226 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,314 +17,317 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ko/lib.po b/l10n/ko/lib.po
index f664342bf17..da8c29be708 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -19,51 +19,47 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "앱 이름이 지정되지 않았습니다."
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "도움말"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "개인"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "설정"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "사용자"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "관리자"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" 업그레이드에 실패했습니다."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "개개인의 프로필 사진은 아직은 암호화 되지 않습니다"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "알수없는 파일형식"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "잘못된 그림"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 5fb0e36ab7d..e37e01ffa42 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "یارمەتی"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "ده‌ستكاری"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "به‌كارهێنه‌ر"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index a7ee0bf6a64..ee55a0da5a2 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hëllef"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Perséinlech"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Astellungen"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Benotzer"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index a2fd4574383..8d01cd0a1ab 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,51 +21,47 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Nenurodytas programos pavadinimas"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pagalba"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Asmeniniai"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Nustatymai"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Vartotojai"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administravimas"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Nepavyko pakelti „%s“ versijos."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Saviti profilio paveiksliukai dar neveikia su šifravimu"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Nežinomas failo tipas"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Netinkamas paveikslėlis"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index dad77f7dc44..9e2615fb042 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Palīdzība"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personīgi"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Iestatījumi"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Lietotāji"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administratori"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Kļūda atjauninot \"%s\""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index cc59cb6e649..07a4a296d72 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-10-08 07:21-0400\n"
-"PO-Revision-Date: 2013-10-07 21:00+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Помош"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Лично"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Подесувања"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Корисници"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Админ"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Невалидна фотографија"
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 0068185b81e..21974e1d32c 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 0a4794dc147..ff93a6574f2 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Bantuan"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Peribadi"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Tetapan"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Pengguna"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index b69db8273f4..10011819b11 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "အကူအညီ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "သုံးစွဲသူ"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "အက်ဒမင်"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 8c88dd2d0bf..bc9074b952b 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hjelp"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personlig"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Innstillinger"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Brukere"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index a45524a68a8..0cb877bee87 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/nl/core.po b/l10n/nl/core.po
index a8e3b835e55..09b7dbf767e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:47+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -275,144 +275,144 @@ msgstr "({count} geselecteerd)"
msgid "Error loading file exists template"
msgstr "Fout bij laden bestand bestaat al sjabloon"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Gedeeld"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Delen"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:686
+#: js/share.js:698
msgid "Error"
msgstr "Fout"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:726
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Fout tijdens het stoppen met delen"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Fout tijdens het veranderen van permissies"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeeld met u en de groep {group} door {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Gedeeld met u door {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Deel met"
-#: js/share.js:189
+#: js/share.js:208
msgid "Share with link"
msgstr "Deel met link"
-#: js/share.js:192
+#: js/share.js:211
msgid "Password protect"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:213 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Wachtwoord"
-#: js/share.js:199
+#: js/share.js:218
msgid "Allow Public Upload"
msgstr "Sta publieke uploads toe"
-#: js/share.js:203
+#: js/share.js:222
msgid "Email link to person"
msgstr "E-mail link naar persoon"
-#: js/share.js:204
+#: js/share.js:223
msgid "Send"
msgstr "Versturen"
-#: js/share.js:209
+#: js/share.js:228
msgid "Set expiration date"
msgstr "Stel vervaldatum in"
-#: js/share.js:210
+#: js/share.js:229
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:243
+#: js/share.js:262
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:246
+#: js/share.js:265
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:284
+#: js/share.js:303
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:320
+#: js/share.js:339
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:341
+#: js/share.js:360
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:353
+#: js/share.js:372
msgid "notify user by email"
msgstr "Gebruiker via e-mail notificeren"
-#: js/share.js:361
+#: js/share.js:380
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:363
+#: js/share.js:382
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:366
+#: js/share.js:385
msgid "create"
msgstr "creëer"
-#: js/share.js:369
+#: js/share.js:388
msgid "update"
msgstr "bijwerken"
-#: js/share.js:372
+#: js/share.js:391
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:375
+#: js/share.js:394
msgid "share"
msgstr "deel"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:428 js/share.js:673
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:667
+#: js/share.js:686
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de verval datum"
-#: js/share.js:679
+#: js/share.js:698
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:694
+#: js/share.js:713
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:705
+#: js/share.js:724
msgid "Email sent"
msgstr "E-mail verzonden"
-#: js/share.js:729
+#: js/share.js:748
msgid "Warning"
msgstr "Waarschuwing"
@@ -422,7 +422,7 @@ msgstr "Het object type is niet gespecificeerd."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Opgeven nieuw"
#: js/tags.js:27
msgid "Delete"
@@ -434,15 +434,15 @@ msgstr "Toevoegen"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "Bewerken tags"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Fout bij laden dialoog sjabloon: {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Geen tags geselecteerd voor verwijdering."
#: js/update.js:17
msgid ""
@@ -524,7 +524,7 @@ msgstr "Persoonlijk"
msgid "Users"
msgstr "Gebruikers"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Apps"
@@ -538,31 +538,31 @@ msgstr "Help"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Fout bij laden tags"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "Tag bestaat al"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Fout bij verwijderen tag(s)"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Fout bij taggen"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "Fout bij ont-taggen"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Fout bij favoriet maken"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "Fout bij verwijderen favorietstatus"
#: templates/403.php:12
msgid "Access forbidden"
@@ -682,12 +682,12 @@ msgstr "Installatie afronden"
msgid "Finishing …"
msgstr "Afronden ..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Afmelden"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index f78cf6d0039..54210fdb8ff 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.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-10-13 20:29-0400\n"
-"PO-Revision-Date: 2013-10-14 00:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:47+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -74,13 +74,13 @@ msgstr "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitena
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr ""
+msgstr "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen."
#: files/error.php:21 files/error.php:26
msgid ""
"Unknown error please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder"
#: hooks/hooks.php:53
msgid "Missing requirements."
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 2885c0a2fb4..b5edb70553e 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -20,51 +20,47 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "De app naam is niet gespecificeerd."
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Help"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Persoonlijk"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Instellingen"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Gebruikers"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Beheerder"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgrade \"%s\" mislukt."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Maatwerk profielafbeelding werkt nog niet met versleuteling"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Onbekend bestandsformaat"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ongeldige afbeelding"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index e08ae3f05fb..09cff489878 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -19,51 +19,47 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Hjelp"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personleg"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Innstillingar"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Brukarar"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrer"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Ukjend filtype"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ugyldig bilete"
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 6f2612e0817..cf8b16de52b 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-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,314 +17,317 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/oc/lib.po b/l10n/oc/lib.po
index 9cb5f58d45a..6d8624d101f 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ajuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Configuracion"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usancièrs"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 6747e51ba07..382f83808a1 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-18 11:47-0400\n"
-"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -17,318 +17,321 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr "ਸੈਟਿੰਗ"
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr "ਫਾਇਲਾਂ"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr "ਅੱਜ"
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr "ਕੱਲ੍ਹ"
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr "ਪਿਛਲੇ ਸਾਲ"
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
-#: template.php:297
+#: private/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/pl/lib.po b/l10n/pl/lib.po
index 02b7e90faec..e7b72b10b05 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Nie określono nazwy aplikacji"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pomoc"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Osobiste"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Ustawienia"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Użytkownicy"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrator"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Błąd przy aktualizacji \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Nieznany typ pliku"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Błędne zdjęcie"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index e8b2c2b05d3..9487725146b 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "O aplicativo \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "O nome do aplicativo não foi especificado."
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ajuda"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Pessoal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Ajustes"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Usuários"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falha na atualização de \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Fotos de perfil personalizados ainda não funcionam com criptografia"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tipo de arquivo desconhecido"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imagem inválida"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 981e62e75f9..b08b898d509 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -6,15 +6,16 @@
# Bruno Martins <brunomomartins@gmail.com>, 2013
# bmgmatias <bmgmatias@gmail.com>, 2013
# Mouxy <daniel@mouxy.net>, 2013
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
# Gontxi <goncalo.baiao@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 10:00+0000\n"
+"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -263,158 +264,158 @@ msgstr "Cancelar"
#: js/oc-dialogs.js:386
msgid "Continue"
-msgstr ""
+msgstr "Continuar"
#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
msgid "(all selected)"
-msgstr ""
+msgstr "(todos seleccionados)"
#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "({count} selected)"
-msgstr ""
+msgstr "({count} seleccionados)"
#: js/oc-dialogs.js:457
msgid "Error loading file exists template"
msgstr ""
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Partilhado"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:686
+#: js/share.js:698
msgid "Error"
msgstr "Erro"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:726
msgid "Error while sharing"
msgstr "Erro ao partilhar"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Erro ao deixar de partilhar"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partilhado consigo e com o grupo {group} por {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Partilhado consigo por {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Partilhar com"
-#: js/share.js:189
+#: js/share.js:208
msgid "Share with link"
msgstr "Partilhar com link"
-#: js/share.js:192
+#: js/share.js:211
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:213 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Password"
-#: js/share.js:199
+#: js/share.js:218
msgid "Allow Public Upload"
msgstr "Permitir Envios Públicos"
-#: js/share.js:203
+#: js/share.js:222
msgid "Email link to person"
msgstr "Enviar o link por e-mail"
-#: js/share.js:204
+#: js/share.js:223
msgid "Send"
msgstr "Enviar"
-#: js/share.js:209
+#: js/share.js:228
msgid "Set expiration date"
msgstr "Especificar data de expiração"
-#: js/share.js:210
+#: js/share.js:229
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:243
+#: js/share.js:262
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:246
+#: js/share.js:265
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:284
+#: js/share.js:303
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:320
+#: js/share.js:339
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:341
+#: js/share.js:360
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:353
+#: js/share.js:372
msgid "notify user by email"
-msgstr ""
+msgstr "notificar utilizador por correio electrónico"
-#: js/share.js:361
+#: js/share.js:380
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:363
+#: js/share.js:382
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:366
+#: js/share.js:385
msgid "create"
msgstr "criar"
-#: js/share.js:369
+#: js/share.js:388
msgid "update"
msgstr "actualizar"
-#: js/share.js:372
+#: js/share.js:391
msgid "delete"
msgstr "apagar"
-#: js/share.js:375
+#: js/share.js:394
msgid "share"
msgstr "partilhar"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:428 js/share.js:673
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:667
+#: js/share.js:686
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:679
+#: js/share.js:698
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:694
+#: js/share.js:713
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:705
+#: js/share.js:724
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:729
+#: js/share.js:748
msgid "Warning"
msgstr "Aviso"
@@ -526,7 +527,7 @@ msgstr "Pessoal"
msgid "Users"
msgstr "Utilizadores"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Aplicações"
@@ -682,14 +683,14 @@ msgstr "Acabar instalação"
#: templates/installation.php:184
msgid "Finishing …"
-msgstr ""
+msgstr "A terminar..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 007a73ccd8a..cf19cb1ae9f 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013
# moliveira <manuel.oliveira@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 10:00+0000\n"
+"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "Esta partilha está protegida por palavra-chave"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index b6b6fdc0a13..9174f731b92 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/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-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-09 18:00+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -49,20 +49,16 @@ msgstr "Utilizadores"
msgid "Admin"
msgstr "Admin"
-#: private/app.php:839
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "A actualização \"%s\" falhou."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Ficheiro desconhecido"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imagem inválida"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 65695821ebb..cbe8a1821e8 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ajutor"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personal"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Setări"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Utilizatori"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Tip fișier necunoscut"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Imagine invalidă"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 4d5a6d252cc..ac52817cc89 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
-"Last-Translator: jekader <jekader@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -23,51 +23,47 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Не выбрано имя приложения"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Помощь"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Личное"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Конфигурация"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Пользователи"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Не смог обновить \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Пользовательские картинки профиля ещё не поддерживают шифрование"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Неизвестный тип файла"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Изображение повреждено"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
new file mode 100644
index 00000000000..b9f2b4a0a5c
--- /dev/null
+++ b/l10n/ru_RU/core.po
@@ -0,0 +1,749 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/share.php:118 ajax/share.php:197
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:168
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/share.php:327 js/share.js:338
+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 ""
+
+#: 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:858
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:859
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:860
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:861
+msgid "today"
+msgstr ""
+
+#: js/js.js:862
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:863
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:864
+msgid "last month"
+msgstr ""
+
+#: js/js.js:865
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:866
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:867
+msgid "last year"
+msgstr ""
+
+#: js/js.js:868
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr "Да"
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr "Нет"
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Отмена"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr "Сделать общим"
+
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/share.js:151 js/share.js:741
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:162
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:169
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:178
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:180
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:203
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
+msgid "Password"
+msgstr "Пароль"
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:274
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:277
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:315
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:354
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:375
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:387
+msgid "notify user by email"
+msgstr ""
+
+#: js/share.js:395
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:397
+msgid "access control"
+msgstr ""
+
+#: js/share.js:400
+msgid "create"
+msgstr ""
+
+#: js/share.js:403
+msgid "update"
+msgstr ""
+
+#: js/share.js:406
+msgid "delete"
+msgstr ""
+
+#: js/share.js:409
+msgid "share"
+msgstr ""
+
+#: js/share.js:443 js/share.js:688
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:701
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:713
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:728
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:739
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:763
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+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:25
+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:110
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4
+#, php-format
+msgid ""
+"The share will expire on %s.\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:6 templates/mail.php:19
+msgid "Cheers!"
+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:66
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:73
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:85
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:90 templates/installation.php:102
+#: templates/installation.php:113 templates/installation.php:124
+#: templates/installation.php:136
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:148
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:155
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:168
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:184
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:184
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:43
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:71
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:38
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:43
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:46
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:52
+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>"
+msgstr ""
+
+#: templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s.<br><br>"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
new file mode 100644
index 00000000000..bf3eca7e82d
--- /dev/null
+++ b/l10n/ru_RU/files.po
@@ -0,0 +1,359 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/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:18 ajax/upload.php:50
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:27
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:64
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:74
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:76
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:77
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:96
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:127 ajax/upload.php:153
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:143
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:170
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11
+msgid "Files"
+msgstr "Файлы"
+
+#: js/file-upload.js:228
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:239
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:306
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:430
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:504
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:509 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:544 js/file-upload.js:560 js/files.js:518 js/files.js:556
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/fileactions.js:125
+msgid "Share"
+msgstr "Сделать общим"
+
+#: js/fileactions.js:137
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr "Переименовать"
+
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:797
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:416
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:736 js/filelist.js:774
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/files.js:25
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:29
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:37
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:51
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:55
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:68
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:72
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:76
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:307
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:518 js/files.js:556
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:569 templates/index.php:56
+msgid "Name"
+msgstr ""
+
+#: js/files.js:570 templates/index.php:68
+msgid "Size"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:70
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:16
+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:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:12
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:34
+msgid "Cancel upload"
+msgstr "Отмена загрузки"
+
+#: templates/index.php:40
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:45
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:62
+msgid "Download"
+msgstr "Загрузка"
+
+#: templates/index.php:75 templates/index.php:76
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:81 templates/index.php:82
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:105
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
new file mode 100644
index 00000000000..80755eb4326
--- /dev/null
+++ b/l10n/ru_RU/files_encryption.po
@@ -0,0 +1,197 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:15+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:15
+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 ""
+
+#: files/error.php:18
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:21 files/error.php:26
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:53
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:54
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:252
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:13
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
new file mode 100644
index 00000000000..c930a845d77
--- /dev/null
+++ b/l10n/ru_RU/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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:15+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: js/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/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
new file mode 100644
index 00000000000..9d681b2ccab
--- /dev/null
+++ b/l10n/ru_RU/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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr "Пароль"
+
+#: templates/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:17
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:20
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:28 templates/public.php:94
+msgid "Download"
+msgstr "Загрузка"
+
+#: templates/public.php:45 templates/public.php:48
+msgid "Upload"
+msgstr "Загрузка"
+
+#: templates/public.php:58
+msgid "Cancel upload"
+msgstr "Отмена загрузки"
+
+#: templates/public.php:91
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
new file mode 100644
index 00000000000..f5cb3125af9
--- /dev/null
+++ b/l10n/ru_RU/files_trashbin.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/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:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+msgid "Error"
+msgstr "Ошибка"
+
+#: lib/trashbin.php:814 lib/trashbin.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:8
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:22
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:25 templates/index.php:27
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:33
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:36 templates/index.php:37
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
new file mode 100644
index 00000000000..62c11500eb4
--- /dev/null
+++ b/l10n/ru_RU/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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:15+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:14
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:86
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:123
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:154
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
new file mode 100644
index 00000000000..661f70a932c
--- /dev/null
+++ b/l10n/ru_RU/lib.po
@@ -0,0 +1,341 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: private/app.php:243
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:254
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:359
+msgid "Help"
+msgstr ""
+
+#: private/app.php:372
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:383
+msgid "Settings"
+msgstr "Настройки"
+
+#: private/app.php:395
+msgid "Users"
+msgstr ""
+
+#: private/app.php:408
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:872
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:60
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:65
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:36
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:66 private/files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: private/files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:228 private/files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/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 ""
+
+#: private/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 ""
+
+#: private/installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:39 private/json.php:62 private/json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr "Файлы"
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:173 private/setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:123
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: private/template/functions.php:124
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: private/template/functions.php:125
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:126
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:128
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: private/template/functions.php:130
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: private/template/functions.php:133
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "years ago"
+msgstr ""
+
+#: private/template.php:297
+msgid "Caused by:"
+msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
new file mode 100644
index 00000000000..10b4d3403cd
--- /dev/null
+++ b/l10n/ru_RU/settings.po
@@ -0,0 +1,609 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:125
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:128
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:128
+msgid "Error"
+msgstr "Ошибка"
+
+#: js/apps.js:129 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:132
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:265
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:287
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:100 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:123 templates/users.php:170
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:280
+msgid "add group"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:443 js/users.js:449 js/users.js:464
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:448
+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 "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:171
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:178
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:191
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:199
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:244
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:250 templates/personal.php:169
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:254 templates/personal.php:172
+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:126
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:133
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:135
+#, 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:146
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:148
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:154
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:159
+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/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
new file mode 100644
index 00000000000..a31f8f0a1ad
--- /dev/null
+++ b/l10n/ru_RU/user_ldap.po
@@ -0,0 +1,410 @@
+# 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-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:31+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/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:37
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:40
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:44
+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 for Users:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+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:107
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Help"
+msgstr ""
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
new file mode 100644
index 00000000000..c8612e2f644
--- /dev/null
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 09:15+0000\n"
+"Last-Translator: masensio <masensio@solidgear.es>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: 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/si_LK/lib.po b/l10n/si_LK/lib.po
index e09474f7703..6d594859047 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "උදව්"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "පෞද්ගලික"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "සිටුවම්"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "පරිශීලකයන්"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "පරිපාලක"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 27f317215a5..fd3fd44c3a8 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,322 +17,325 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/sk_SK/core.po b/l10n/sk_SK/core.po
index b09244fa69b..96b0f51bf93 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 21:00+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,9 +27,9 @@ msgstr "%s s Vami zdieľa »%s«"
#: ajax/share.php:168
#, php-format
msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Nebolo možné odoslať email týmto používateľom: %s "
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr "skupina"
@@ -60,23 +60,23 @@ msgstr "... %d%% dokončených ..."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Obrázok alebo súbor nebol zadaný"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Neznámy typ súboru"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Chybný obrázok"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Dáta pre orezanie neboli zadané"
#: js/config.php:32
msgid "Sunday"
@@ -220,7 +220,7 @@ msgstr "Výber"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -236,28 +236,28 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Chyba pri nahrávaní šablóny správy: {error}"
#: js/oc-dialogs.js:347
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "{count} konflikt súboru"
+msgstr[1] "{count} konflikty súboru"
+msgstr[2] "{count} konfliktov súboru"
#: js/oc-dialogs.js:361
msgid "One file conflict"
-msgstr ""
+msgstr "Jeden konflikt súboru"
#: js/oc-dialogs.js:367
msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "Ktoré súbory chcete ponechať?"
#: js/oc-dialogs.js:368
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
-msgstr ""
+msgstr "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo."
#: js/oc-dialogs.js:376
msgid "Cancel"
@@ -265,158 +265,158 @@ msgstr "Zrušiť"
#: js/oc-dialogs.js:386
msgid "Continue"
-msgstr ""
+msgstr "Pokračovať"
#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
msgid "(all selected)"
-msgstr ""
+msgstr "(všetko vybrané)"
#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "({count} selected)"
-msgstr ""
+msgstr "({count} vybraných)"
#: js/oc-dialogs.js:457
msgid "Error loading file exists template"
msgstr ""
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Zdieľané"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr "Chyba"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Chyba počas ukončenia zdieľania"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Chyba počas zmeny oprávnení"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Zdieľané s vami používateľom {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Zdieľať s"
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr "Zdieľať cez odkaz"
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Heslo"
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "Povoliť verejné nahrávanie"
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr "Odoslať odkaz emailom"
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr "Odoslať"
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr "Nastaviť dátum expirácie"
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr "Zdieľať cez e-mail:"
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
-msgstr ""
+msgstr "upozorniť používateľa emailom"
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr "vymazať"
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr "zdieľať"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr "Email odoslaný"
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr "Varovanie"
@@ -426,7 +426,7 @@ msgstr "Nešpecifikovaný typ objektu."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Zadať nový"
#: js/tags.js:27
msgid "Delete"
@@ -438,15 +438,15 @@ msgstr "Pridať"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "Upraviť štítky"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Chyba pri načítaní šablóny dialógu: {error}"
#: js/tags.js:261
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Nie sú vybraté štítky na zmazanie."
#: js/update.js:17
msgid ""
@@ -528,7 +528,7 @@ msgstr "Osobné"
msgid "Users"
msgstr "Používatelia"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Aplikácie"
@@ -542,31 +542,31 @@ msgstr "Pomoc"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "Chyba pri načítaní štítkov"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "Štítok už existuje"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Chyba pri mazaní štítka(ov)"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "Chyba pri pridaní štítka"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "Chyba pri odobratí štítka"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Chyba pri pridaní do obľúbených"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "Chyba pri odobratí z obľúbených"
#: templates/403.php:12
msgid "Access forbidden"
@@ -584,18 +584,18 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr ""
+msgstr "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n"
#: templates/altmail.php:4
#, php-format
msgid ""
"The share will expire on %s.\n"
"\n"
-msgstr ""
+msgstr "Zdieľanie vyexpiruje %s.\n\n"
#: templates/altmail.php:6 templates/mail.php:19
msgid "Cheers!"
-msgstr ""
+msgstr "Za zdravie!"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
@@ -684,14 +684,14 @@ msgstr "Dokončiť inštaláciu"
#: templates/installation.php:184
msgid "Finishing …"
-msgstr ""
+msgstr "Dokončujem..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Odhlásiť"
@@ -711,11 +711,11 @@ msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu
#: templates/login.php:17
msgid "Server side authentication failed!"
-msgstr ""
+msgstr "Autentifikácia na serveri zlyhala!"
#: templates/login.php:18
msgid "Please contact your administrator."
-msgstr ""
+msgstr "Kontaktujte prosím vášho administrátora."
#: templates/login.php:38
msgid "Lost your password?"
@@ -738,12 +738,12 @@ msgstr "Alternatívne prihlasovanie"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>"
#: templates/mail.php:17
#, php-format
msgid "The share will expire on %s.<br><br>"
-msgstr ""
+msgstr "Zdieľanie vyexpiruje %s.<br><br>"
#: templates/update.php:3
#, php-format
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index dd151cd941a..cd5f6cf4958 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 21:10+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,62 +28,62 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
msgid "Could not move %s"
msgstr "Nie je možné presunúť %s"
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/upload.php:18 ajax/upload.php:50
msgid "Unable to set upload directory."
msgstr "Nemožno nastaviť priečinok pre nahrané súbory."
-#: ajax/upload.php:22
+#: ajax/upload.php:27
msgid "Invalid Token"
msgstr "Neplatný token"
-#: ajax/upload.php:59
+#: ajax/upload.php:64
msgid "No file was uploaded. Unknown error"
msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
-#: ajax/upload.php:66
+#: ajax/upload.php:71
msgid "There is no error, the file uploaded with success"
msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
-#: ajax/upload.php:67
+#: ajax/upload.php:72
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Nahraný súbor predčil konfiguračnú direktívu upload_max_filesize v súbore php.ini:"
-#: ajax/upload.php:69
+#: ajax/upload.php:74
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
-#: ajax/upload.php:70
+#: ajax/upload.php:75
msgid "The uploaded file was only partially uploaded"
msgstr "Ukladaný súbor sa nahral len čiastočne"
-#: ajax/upload.php:71
+#: ajax/upload.php:76
msgid "No file was uploaded"
msgstr "Žiadny súbor nebol uložený"
-#: ajax/upload.php:72
+#: ajax/upload.php:77
msgid "Missing a temporary folder"
msgstr "Chýba dočasný priečinok"
-#: ajax/upload.php:73
+#: ajax/upload.php:78
msgid "Failed to write to disk"
msgstr "Zápis na disk sa nepodaril"
-#: ajax/upload.php:91
+#: ajax/upload.php:96
msgid "Not enough storage available"
msgstr "Nedostatok dostupného úložného priestoru"
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
-#: ajax/upload.php:138
+#: ajax/upload.php:143
msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor"
-#: ajax/upload.php:165
+#: ajax/upload.php:170
msgid "Invalid directory."
msgstr "Neplatný priečinok."
@@ -91,52 +91,52 @@ msgstr "Neplatný priečinok."
msgid "Files"
msgstr "Súbory"
-#: js/file-upload.js:224
+#: js/file-upload.js:228
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov"
-#: js/file-upload.js:235
+#: js/file-upload.js:239
msgid "Not enough space available"
msgstr "Nie je k dispozícii dostatok miesta"
-#: js/file-upload.js:302
+#: js/file-upload.js:306
msgid "Upload cancelled."
msgstr "Odosielanie zrušené."
-#: js/file-upload.js:336
+#: js/file-upload.js:340
msgid "Could not get result from server."
-msgstr ""
+msgstr "Nepodarilo sa dostať výsledky zo servera."
-#: js/file-upload.js:426
+#: js/file-upload.js:430
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-#: js/file-upload.js:500
+#: js/file-upload.js:504
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne."
-#: js/file-upload.js:505 lib/app.php:53
+#: js/file-upload.js:509 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
+#: js/file-upload.js:544 js/file-upload.js:560 js/files.js:518 js/files.js:556
msgid "Error"
msgstr "Chyba"
-#: js/fileactions.js:119
+#: js/fileactions.js:125
msgid "Share"
msgstr "Zdieľať"
-#: js/fileactions.js:131
+#: js/fileactions.js:137
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/fileactions.js:184
+#: js/fileactions.js:194
msgid "Rename"
msgstr "Premenovať"
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:797
msgid "Pending"
msgstr "Prebieha"
@@ -180,9 +180,9 @@ msgstr[2] "%n súborov"
#: js/filelist.js:541
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} a {files}"
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:736 js/filelist.js:774
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Nahrávam %n súbor"
@@ -215,14 +215,14 @@ msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
-msgstr ""
+msgstr "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste."
#: js/files.js:72
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom."
#: js/files.js:76
msgid ""
@@ -238,7 +238,7 @@ msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, mô
#: js/files.js:518 js/files.js:556
msgid "Error moving file"
-msgstr ""
+msgstr "Chyba pri presúvaní súboru"
#: js/files.js:569 templates/index.php:56
msgid "Name"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index e85df073fcc..2f3560dc840 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 21: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"
@@ -19,53 +19,49 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu."
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "Nešpecifikované meno aplikácie"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pomoc"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Osobné"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Nastavenia"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Používatelia"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Administrátor"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Zlyhala aktualizácia \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
-msgstr ""
+msgstr "Neznámy typ súboru"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
-msgstr ""
+msgstr "Chybný obrázok"
#: private/defaults.php:36
msgid "web services under your control"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index da76f4bdb0b..3a73331ae03 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-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 21:50+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -88,11 +88,11 @@ msgstr "Nemožno aktualizovať aplikáciu."
#: changepassword/controller.php:20
msgid "Wrong password"
-msgstr ""
+msgstr "Nesprávne heslo"
#: changepassword/controller.php:42
msgid "No user supplied"
-msgstr ""
+msgstr "Nebol uvedený používateľ"
#: changepassword/controller.php:74
msgid ""
@@ -113,7 +113,7 @@ msgstr ""
#: changepassword/controller.php:92 changepassword/controller.php:103
msgid "Unable to change password"
-msgstr ""
+msgstr "Zmena hesla sa nepodarila"
#: js/apps.js:43
msgid "Update to {appversion}"
@@ -161,7 +161,7 @@ msgstr "Aktualizované"
#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Vybrať profilový obrázok"
#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
@@ -344,11 +344,11 @@ msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinác
#: templates/admin.php:170
msgid "Allow mail notification"
-msgstr ""
+msgstr "Povoliť upozornenia emailom"
#: templates/admin.php:171
msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Povoliť používateľom upozornenia emailom pre svoje zdieľané súbory"
#: templates/admin.php:178
msgid "Security"
@@ -503,15 +503,15 @@ msgstr "Profilová fotka"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Nahrať nový"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Vyberte nový zo Súborov"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Zmazať obrázok"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -519,11 +519,11 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Prerušiť"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Vybrať ako profilový obrázok"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 8e4e92b4dc7..7bedd103927 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-19 08:26-0400\n"
+"PO-Revision-Date: 2013-10-18 21:30+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -371,11 +371,11 @@ msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID
#: templates/settings.php:103
msgid "UUID Attribute for Users:"
-msgstr ""
+msgstr "UUID atribút pre používateľov:"
#: templates/settings.php:104
msgid "UUID Attribute for Groups:"
-msgstr ""
+msgstr "UUID atribút pre skupiny:"
#: templates/settings.php:105
msgid "Username-LDAP User Mapping"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 57196586893..5ca4a8b687c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pomoč"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Osebno"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Nastavitve"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Uporabniki"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Skrbništvo"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 8d7f5344cb4..81de426bccb 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Ndihmë"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Personale"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Parametra"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Përdoruesit"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Admin"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 7e3ecdf193f..d70e237a46c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Помоћ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Лично"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Поставке"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Корисници"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Администратор"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 322d7d62992..6fba0c121da 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Pomoć"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Lično"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Podešavanja"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Korisnici"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Adninistracija"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 02738aeb52e..442b97e303f 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -5,6 +5,7 @@
# Translators:
# Daniel Sandman <revoltism@gmail.com>, 2013
# Gunnar Norin <blittan@xbmc.org>, 2013
+# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# medialabs, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 18:50+0000\n"
+"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -277,144 +278,144 @@ msgstr "({count} valda)"
msgid "Error loading file exists template"
msgstr "Fel uppstod filmall existerar"
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr "Delad"
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr "Dela"
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:686
+#: js/share.js:698
msgid "Error"
msgstr "Fel"
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:726
msgid "Error while sharing"
msgstr "Fel vid delning"
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr "Fel när delning skulle avslutas"
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr "Fel vid ändring av rättigheter"
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delad med dig och gruppen {group} av {owner}"
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr "Delad med dig av {owner}"
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr "Delad med"
-#: js/share.js:189
+#: js/share.js:208
msgid "Share with link"
msgstr "Delad med länk"
-#: js/share.js:192
+#: js/share.js:211
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:213 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr "Lösenord"
-#: js/share.js:199
+#: js/share.js:218
msgid "Allow Public Upload"
msgstr "Tillåt publik uppladdning"
-#: js/share.js:203
+#: js/share.js:222
msgid "Email link to person"
msgstr "E-posta länk till person"
-#: js/share.js:204
+#: js/share.js:223
msgid "Send"
msgstr "Skicka"
-#: js/share.js:209
+#: js/share.js:228
msgid "Set expiration date"
msgstr "Sätt utgångsdatum"
-#: js/share.js:210
+#: js/share.js:229
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:243
+#: js/share.js:262
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:246
+#: js/share.js:265
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:284
+#: js/share.js:303
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:320
+#: js/share.js:339
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:341
+#: js/share.js:360
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:353
+#: js/share.js:372
msgid "notify user by email"
msgstr "notifiera användare via e-post"
-#: js/share.js:361
+#: js/share.js:380
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:363
+#: js/share.js:382
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:366
+#: js/share.js:385
msgid "create"
msgstr "skapa"
-#: js/share.js:369
+#: js/share.js:388
msgid "update"
msgstr "uppdatera"
-#: js/share.js:372
+#: js/share.js:391
msgid "delete"
msgstr "radera"
-#: js/share.js:375
+#: js/share.js:394
msgid "share"
msgstr "dela"
-#: js/share.js:409 js/share.js:654
+#: js/share.js:428 js/share.js:673
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:667
+#: js/share.js:686
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:679
+#: js/share.js:698
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:694
+#: js/share.js:713
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:705
+#: js/share.js:724
msgid "Email sent"
msgstr "E-post skickat"
-#: js/share.js:729
+#: js/share.js:748
msgid "Warning"
msgstr "Varning"
@@ -424,7 +425,7 @@ msgstr "Objekttypen är inte specificerad."
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "Skriv nytt"
#: js/tags.js:27
msgid "Delete"
@@ -526,7 +527,7 @@ msgstr "Personligt"
msgid "Users"
msgstr "Användare"
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr "Program"
@@ -560,7 +561,7 @@ msgstr ""
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "Fel favorisering"
#: tags/controller.php:108
msgid "Error unfavoriting"
@@ -684,12 +685,12 @@ msgstr "Avsluta installation"
msgid "Finishing …"
msgstr "Avslutar ..."
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
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:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr "Logga ut"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index b1e9501ba6a..8e97d344e59 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -4,6 +4,7 @@
#
# Translators:
# Daniel Sandman <revoltism@gmail.com>, 2013
+# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# medialabs, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-13 20:29-0400\n"
-"PO-Revision-Date: 2013-10-14 00:29+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:00+0000\n"
+"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,13 +78,13 @@ msgstr "Lösenordet för din privata nyckel är inte giltig! Troligen har ditt l
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr ""
+msgstr "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig."
#: files/error.php:21 files/error.php:26
msgid ""
"Unknown error please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "Oväntat fel, kolla dina system inställningar eller kontakta din administratör"
#: hooks/hooks.php:53
msgid "Missing requirements."
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index d591ac24998..e4bb926cb98 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# Stefan Gagner <stefan@mei-ya.se>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:00+0000\n"
+"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "Den här delningen är lösenordsskyddad"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 8b8e72c53a1..6b053c135a1 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/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-10-13 20:29-0400\n"
-"PO-Revision-Date: 2013-10-11 21:20+0000\n"
-"Last-Translator: Daniel Sandman <revoltism@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -52,20 +52,16 @@ msgstr "Användare"
msgid "Admin"
msgstr "Admin"
-#: private/app.php:839
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Misslyckades med att uppgradera \"%s\"."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Anpassningsbara profilbilder fungerar inte med kryptering ännu."
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Okänd filtyp"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Ogiltig bild"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 0737616c284..63264b5cc77 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -5,6 +5,7 @@
# Translators:
# Daniel Sandman <revoltism@gmail.com>, 2013
# Gunnar Norin <blittan@xbmc.org>, 2013
+# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# Jan Busk, 2013
# Jan Busk, 2013
# medialabs, 2013
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:00+0000\n"
+"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -349,11 +350,11 @@ msgstr "Tillåt bara delning med användare i egna grupper"
#: templates/admin.php:170
msgid "Allow mail notification"
-msgstr ""
+msgstr "Tillåt e-post notifikation"
#: templates/admin.php:171
msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Tillåt användare att skicka e-port notifikationer för delade filer"
#: templates/admin.php:178
msgid "Security"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 5ab40729a96..7cb62c84f2d 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
# Jan Busk, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-16 19:00+0000\n"
+"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -372,11 +373,11 @@ msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-a
#: templates/settings.php:103
msgid "UUID Attribute for Users:"
-msgstr ""
+msgstr "UUID Attribut för Användare:"
#: templates/settings.php:104
msgid "UUID Attribute for Groups:"
-msgstr ""
+msgstr "UUID Attribut för Grupper:"
#: templates/settings.php:105
msgid "Username-LDAP User Mapping"
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 1c9b03e9174..f3230ae4002 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,318 +17,321 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: private/app.php:359
msgid "Help"
msgstr ""
-#: app.php:374
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: app.php:385
+#: private/app.php:383
msgid "Settings"
msgstr ""
-#: app.php:397
+#: private/app.php:395
msgid "Users"
msgstr ""
-#: app.php:410
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: app.php:839
+#: private/app.php:872
#, 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
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
-#: defaults.php:35
+#: private/defaults.php:36
msgid "web services under your control"
msgstr ""
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
#, php-format
msgid "cannot open \"%s\""
msgstr ""
-#: files.php:226
+#: private/files.php:226
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:227
+#: private/files.php:227
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
msgid "Back to Files"
msgstr ""
-#: files.php:253
+#: private/files.php:253
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:254
+#: private/files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
msgstr ""
-#: installer.php:63
+#: private/installer.php:63
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:70
+#: private/installer.php:70
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:75
+#: private/installer.php:75
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:89
+#: private/installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:103
+#: private/installer.php:103
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:125
+#: private/installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:131
+#: private/installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:140
+#: private/installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:146
+#: private/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
+#: private/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
+#: private/installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:175
+#: private/installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: json.php:28
+#: private/json.php:28
msgid "Application is not enabled"
msgstr ""
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
msgid "Authentication error"
msgstr ""
-#: json.php:51
+#: private/json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
msgid "Images"
msgstr ""
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
msgstr ""
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
msgstr ""
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
msgstr ""
-#: setup/mssql.php:20
+#: private/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
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup/mysql.php:12
+#: private/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
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/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
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
msgid "Drop this user from MySQL"
msgstr ""
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
msgid "Drop this user from MySQL."
msgstr ""
-#: setup/oci.php:34
+#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
msgstr ""
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
msgstr ""
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
msgstr ""
-#: setup.php:28
+#: private/setup.php:28
msgid "Set an admin username."
msgstr ""
-#: setup.php:31
+#: private/setup.php:31
msgid "Set an admin password."
msgstr ""
-#: setup.php:184
+#: private/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
+#: private/setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:122
msgid "seconds ago"
msgstr ""
-#: template/functions.php:97
+#: private/template/functions.php:123
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:98
+#: private/template/functions.php:124
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:99
+#: private/template/functions.php:125
msgid "today"
msgstr ""
-#: template/functions.php:100
+#: private/template/functions.php:126
msgid "yesterday"
msgstr ""
-#: template/functions.php:101
+#: private/template/functions.php:128
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:102
+#: private/template/functions.php:130
msgid "last month"
msgstr ""
-#: template/functions.php:103
+#: private/template/functions.php:131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:104
+#: private/template/functions.php:133
msgid "last year"
msgstr ""
-#: template/functions.php:105
+#: private/template/functions.php:134
msgid "years ago"
msgstr ""
-#: template.php:297
+#: private/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/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 4fd74012754..71d092f0437 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "உதவி"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "தனிப்பட்ட"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "அமைப்புகள்"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "பயனாளர்"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "நிர்வாகம்"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 843489a11c6..3826c2acb7d 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "సహాయం"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr ""
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "అమరికలు"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "వాడుకరులు"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 64f362f1665..7a58fd0a222 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/share.php:327
+#: ajax/share.php:327 js/share.js:338
msgid "group"
msgstr ""
@@ -273,144 +273,144 @@ msgstr ""
msgid "Error loading file exists template"
msgstr ""
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
msgstr ""
-#: js/share.js:90
+#: js/share.js:109
msgid "Share"
msgstr ""
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:701
+#: js/share.js:713
msgid "Error"
msgstr ""
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:741
msgid "Error while sharing"
msgstr ""
-#: js/share.js:143
+#: js/share.js:162
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:150
+#: js/share.js:169
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:159
+#: js/share.js:178
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:161
+#: js/share.js:180
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:184
+#: js/share.js:203
msgid "Share with"
msgstr ""
-#: js/share.js:189
+#: js/share.js:220
msgid "Share with link"
msgstr ""
-#: js/share.js:192
+#: js/share.js:223
msgid "Password protect"
msgstr ""
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:225 templates/installation.php:57 templates/login.php:32
msgid "Password"
msgstr ""
-#: js/share.js:199
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:203
+#: js/share.js:234
msgid "Email link to person"
msgstr ""
-#: js/share.js:204
+#: js/share.js:235
msgid "Send"
msgstr ""
-#: js/share.js:209
+#: js/share.js:240
msgid "Set expiration date"
msgstr ""
-#: js/share.js:210
+#: js/share.js:241
msgid "Expiration date"
msgstr ""
-#: js/share.js:243
+#: js/share.js:274
msgid "Share via email:"
msgstr ""
-#: js/share.js:246
+#: js/share.js:277
msgid "No people found"
msgstr ""
-#: js/share.js:284
+#: js/share.js:315
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:320
+#: js/share.js:354
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:341
+#: js/share.js:375
msgid "Unshare"
msgstr ""
-#: js/share.js:353
+#: js/share.js:387
msgid "notify user by email"
msgstr ""
-#: js/share.js:361
+#: js/share.js:395
msgid "can edit"
msgstr ""
-#: js/share.js:363
+#: js/share.js:397
msgid "access control"
msgstr ""
-#: js/share.js:366
+#: js/share.js:400
msgid "create"
msgstr ""
-#: js/share.js:369
+#: js/share.js:403
msgid "update"
msgstr ""
-#: js/share.js:372
+#: js/share.js:406
msgid "delete"
msgstr ""
-#: js/share.js:375
+#: js/share.js:409
msgid "share"
msgstr ""
-#: js/share.js:409 js/share.js:654
+#: js/share.js:443 js/share.js:688
msgid "Password protected"
msgstr ""
-#: js/share.js:667
+#: js/share.js:701
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:679
+#: js/share.js:713
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:694
+#: js/share.js:728
msgid "Sending ..."
msgstr ""
-#: js/share.js:705
+#: js/share.js:739
msgid "Email sent"
msgstr ""
-#: js/share.js:729
+#: js/share.js:763
msgid "Warning"
msgstr ""
@@ -522,7 +522,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
msgid "Apps"
msgstr ""
@@ -680,12 +680,12 @@ msgstr ""
msgid "Finishing …"
msgstr ""
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:70
+#: templates/layout.user.php:71
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 07e30002d07..94b296d2309 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,62 +28,62 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/upload.php:18 ajax/upload.php:50
msgid "Unable to set upload directory."
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:27
msgid "Invalid Token"
msgstr ""
-#: ajax/upload.php:59
+#: ajax/upload.php:64
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:66
+#: ajax/upload.php:71
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:67
+#: ajax/upload.php:72
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:69
+#: ajax/upload.php:74
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:70
+#: ajax/upload.php:75
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:71
+#: ajax/upload.php:76
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:72
+#: ajax/upload.php:77
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:73
+#: ajax/upload.php:78
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:91
+#: ajax/upload.php:96
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:138
+#: ajax/upload.php:143
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:165
+#: ajax/upload.php:170
msgid "Invalid directory."
msgstr ""
@@ -91,52 +91,52 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:224
+#: js/file-upload.js:228
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:235
+#: js/file-upload.js:239
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:302
+#: js/file-upload.js:306
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:336
+#: js/file-upload.js:340
msgid "Could not get result from server."
msgstr ""
-#: js/file-upload.js:426
+#: js/file-upload.js:430
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:500
+#: js/file-upload.js:504
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:505 lib/app.php:53
+#: js/file-upload.js:509 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
+#: js/file-upload.js:544 js/file-upload.js:560 js/files.js:518 js/files.js:556
msgid "Error"
msgstr ""
-#: js/fileactions.js:119
+#: js/fileactions.js:125
msgid "Share"
msgstr ""
-#: js/fileactions.js:131
+#: js/fileactions.js:137
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:184
+#: js/fileactions.js:194
msgid "Rename"
msgstr ""
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:797
msgid "Pending"
msgstr ""
@@ -180,7 +180,7 @@ msgstr[1] ""
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:736 js/filelist.js:774
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ca2fd5c93c4..9dba2f5fc42 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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 9d23b26ddb6..8dfa754f238 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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 3b0a125402d..1e5a1e2021e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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 ef49667fffa..754ef594a45 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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_versions.pot b/l10n/templates/files_versions.pot
index 00fcf86e8af..5f6a1436e0b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,22 +22,22 @@ msgstr ""
msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:7
+#: js/versions.js:14
msgid "Versions"
msgstr ""
-#: js/versions.js:53
+#: js/versions.js:60
msgid "Failed to revert {file} to revision {timestamp}."
msgstr ""
-#: js/versions.js:79
+#: js/versions.js:86
msgid "More versions..."
msgstr ""
-#: js/versions.js:116
+#: js/versions.js:123
msgid "No other versions available"
msgstr ""
-#: js/versions.js:147
+#: js/versions.js:154
msgid "Restore"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e744928cb99..f0d932ef3b6 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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"
@@ -54,15 +54,11 @@ msgstr ""
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d778ec6d028..eb17dfe2bb0 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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"
@@ -54,15 +54,11 @@ msgstr ""
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: avatar.php:64
+#: avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: avatar.php:69
+#: avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 25819bab96d..3ac873cdaad 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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_ldap.pot b/l10n/templates/user_ldap.pot
index bd4cf720ed7..bed6d1ff194 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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 91204b57951..ff4e6f73057 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
+"POT-Creation-Date: 2013-10-20 07:49-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/lib.po b/l10n/th_TH/lib.po
index cd3e90c37a9..b753c101366 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "ช่วยเหลือ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "ส่วนตัว"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "ตั้งค่า"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "ผู้ดูแล"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 3d7178c5ba1..f93f7b57727 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/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-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-08 21:50+0000\n"
-"Last-Translator: Caner BAŞARAN <basaran.caner@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -51,20 +51,16 @@ msgstr "Kullanıcılar"
msgid "Admin"
msgstr "Yönetici"
-#: private/app.php:839
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" yükseltme başarısız oldu."
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Hala özel profil resminiz şifreleme ile çalışmıyor"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "Bilinmeyen dosya türü"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "Geçersiz resim"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 58fd4e0c96f..1370c6fe4af 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,61 +7,57 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: Uighur <uqkun@outlook.com>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "ياردەم"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "شەخسىي"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr ""
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index c5b93ce8991..cdee5129428 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Допомога"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Особисте"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Налаштування"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Користувачі"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Адмін"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index bdc24e477e2..a5e239e5af5 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "مدد"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "ذاتی"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "سیٹینگز"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "یوزرز"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "ایڈمن"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index e17c35b1e78..6041bdc5497 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:20+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "Giúp đỡ"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "Cá nhân"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "Cài đặt"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "Người dùng"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "Quản trị"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index f79a9210b9c..7358a8ace13 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -20,51 +20,47 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "帮助"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "个人"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "设置"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "用户"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "管理"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 0b9662277b0..7c31a87f00c 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -17,51 +17,47 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr ""
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "幫助"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "個人"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "設定"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "用戶"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "管理"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr ""
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr ""
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index bc8ee7c2a27..6af0762d090 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-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-05 16:00+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+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"
@@ -18,51 +18,47 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:237
+#: private/app.php:243
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。"
-#: private/app.php:248
+#: private/app.php:254
msgid "No app name specified"
msgstr "沒有指定應用程式名稱"
-#: private/app.php:352
+#: private/app.php:359
msgid "Help"
msgstr "說明"
-#: private/app.php:365
+#: private/app.php:372
msgid "Personal"
msgstr "個人"
-#: private/app.php:376
+#: private/app.php:383
msgid "Settings"
msgstr "設定"
-#: private/app.php:388
+#: private/app.php:395
msgid "Users"
msgstr "使用者"
-#: private/app.php:401
+#: private/app.php:408
msgid "Admin"
msgstr "管理"
-#: private/app.php:832
+#: private/app.php:872
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "升級失敗:%s"
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "自訂大頭貼暫時不能和加密功能同時使用"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
msgid "Unknown filetype"
msgstr "未知的檔案類型"
-#: private/avatar.php:69
+#: private/avatar.php:65
msgid "Invalid image"
msgstr "無效的圖片"
diff --git a/lib/base.php b/lib/base.php
index 7bebb5f93a0..ee925b8f736 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -828,6 +828,7 @@ class OC {
OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
// login
OC_User::setUserId($_COOKIE['oc_username']);
+ OC_User::setDisplayName($_COOKIE['oc_username'], $_COOKIE['display_name']);
OC_Util::redirectToDefaultPage();
// doesn't return
}
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index fef5dc3cb22..f0cbe6a5a07 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Usuaris",
"Admin" => "Administració",
"Failed to upgrade \"%s\"." => "Ha fallat l'actualització \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Les imatges de perfil personals encara no funcionen amb encriptació",
"Unknown filetype" => "Tipus de fitxer desconegut",
"Invalid image" => "Imatge no vàlida",
"web services under your control" => "controleu els vostres serveis web",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 145078c0bd2..0b09997ee2f 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Uživatelé",
"Admin" => "Administrace",
"Failed to upgrade \"%s\"." => "Selhala aktualizace verze \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Vlastní profilové obrázky zatím nefungují v kombinaci se šifrováním",
"Unknown filetype" => "Neznámý typ souboru",
"Invalid image" => "Chybný obrázek",
"web services under your control" => "webové služby pod Vaší kontrolou",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index e4734755ae0..bf233e0338d 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Brugere",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Upgradering af \"%s\" fejlede",
-"Custom profile pictures don't work with encryption yet" => "Personligt profilbillede virker endnu ikke sammen med kryptering",
"Unknown filetype" => "Ukendt filtype",
"Invalid image" => "Ugyldigt billede",
"web services under your control" => "Webtjenester under din kontrol",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 136cdc6476f..84543fa75d2 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Benutzer",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
-"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt",
"Unknown filetype" => "Unbekannter Dateityp",
"Invalid image" => "Ungültiges Bild",
"web services under your control" => "Web-Services unter Deiner Kontrolle",
@@ -58,13 +57,13 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
"Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden.",
"seconds ago" => "Gerade eben",
-"_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"),
-"_%n hour ago_::_%n hours ago_" => array("","Vor %n Stunden"),
+"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
"today" => "Heute",
"yesterday" => "Gestern",
-"_%n day go_::_%n days ago_" => array("","Vor %n Tagen"),
+"_%n day go_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
"last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"),
+"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Caused by:" => "Verursacht durch:"
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 76f0ee8457e..a84b954eb44 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Benutzer",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
-"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt",
"Unknown filetype" => "Unbekannter Dateityp",
"Invalid image" => "Ungültiges Bild",
"web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 26d44f39893..73697d101c1 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Users",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Failed to upgrade \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Custom profile pictures don't work with encryption yet",
"Unknown filetype" => "Unknown filetype",
"Invalid image" => "Invalid image",
"web services under your control" => "web services under your control",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 289ef360d1c..7e56e31aeaf 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Usuarios",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "Falló la actualización \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Las imágenes de perfil personalizadas no funcionan con el cifrado aún",
"Unknown filetype" => "Tipo de archivo desconocido",
"Invalid image" => "Imagen inválida",
"web services under your control" => "Servicios web bajo su control",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index c1881141636..e307979fa74 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Kasutajad",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ebaõnnestunud uuendus \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga",
"Unknown filetype" => "Tundmatu failitüüp",
"Invalid image" => "Vigane pilt",
"web services under your control" => "veebitenused sinu kontrolli all",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 5e9a9a1a1f3..68f51d34441 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Käyttäjät",
"Admin" => "Ylläpitäjä",
"Failed to upgrade \"%s\"." => "Kohteen \"%s\" päivitys epäonnistui.",
-"Custom profile pictures don't work with encryption yet" => "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä",
"Unknown filetype" => "Tuntematon tiedostotyyppi",
"Invalid image" => "Virheellinen kuva",
"web services under your control" => "verkkopalvelut hallinnassasi",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 73cb724a58a..895daa5b452 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Utilisateurs",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement.",
"Unknown filetype" => "Type de fichier inconnu",
"Invalid image" => "Image invalide",
"web services under your control" => "services web sous votre contrôle",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index ce3c7ecf488..72ee66b6f57 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Usuarios",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "Non foi posíbel anovar «%s».",
-"Custom profile pictures don't work with encryption yet" => "As imaxes personalizadas de perfil aínda non funcionan co cifrado",
"Unknown filetype" => "Tipo de ficheiro descoñecido",
"Invalid image" => "Imaxe incorrecta",
"web services under your control" => "servizos web baixo o seu control",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index e944291caee..cf1e6c2f100 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "A(z) \"%s\" alkalmazást nem lehet telepíteni, mert nem kompatibilis az ownCloud telepített verziójával.",
"No app name specified" => "Nincs az alkalmazás név megadva.",
"Help" => "Súgó",
"Personal" => "Személyes",
@@ -16,8 +17,16 @@ $TRANSLATIONS = array(
"Back to Files" => "Vissza a Fájlokhoz",
"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.",
+"No source specified when installing app" => "Az alkalmazás telepítéséhez nincs forrás megadva",
+"No href specified when installing app from http" => "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
+"No path specified when installing app from local file" => "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
+"Archives of type %s are not supported" => "A(z) %s típusú tömörített állomány nem támogatott",
+"Failed to open archive when installing app" => "Nem sikerült megnyitni a tömörített állományt a telepítés során",
"App does not provide an info.xml file" => "Az alkalmazás nem szolgáltatott info.xml file-t",
+"App can't be installed because of not allowed code in the App" => "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
"App can't be installed because it is not compatible with this version of ownCloud" => "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-áruházban feltüntetett verzióval.",
"App directory already exists" => "Az alkalmazás mappája már létezik",
"Can't create app folder. Please fix permissions. %s" => "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s",
"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
@@ -48,13 +57,13 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"",
"seconds ago" => "pár másodperce",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n perccel ezelőtt"),
+"_%n hour ago_::_%n hours ago_" => array("%n órával ezelőtt","%n órával ezelőtt"),
"today" => "ma",
"yesterday" => "tegnap",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("%n nappal ezelőtt","%n nappal ezelőtt"),
"last month" => "múlt hónapban",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
"last year" => "tavaly",
"years ago" => "több éve",
"Caused by:" => "Okozta:"
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 91efcca7f49..240442d396d 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Utenti",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura",
"Unknown filetype" => "Tipo di file sconosciuto",
"Invalid image" => "Immagine non valida",
"web services under your control" => "servizi web nelle tue mani",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 7023c829f8f..e4e45462779 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "ユーザ",
"Admin" => "管理",
"Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
-"Custom profile pictures don't work with encryption yet" => "暗号無しでは利用不可なカスタムプロフィール画像",
"Unknown filetype" => "不明なファイルタイプ",
"Invalid image" => "無効な画像",
"web services under your control" => "管理下のウェブサービス",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 3ef39fefa60..297e7ac5805 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "사용자",
"Admin" => "관리자",
"Failed to upgrade \"%s\"." => "\"%s\" 업그레이드에 실패했습니다.",
-"Custom profile pictures don't work with encryption yet" => "개개인의 프로필 사진은 아직은 암호화 되지 않습니다",
"Unknown filetype" => "알수없는 파일형식",
"Invalid image" => "잘못된 그림",
"web services under your control" => "내가 관리하는 웹 서비스",
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 72e84bc4b00..e322c9141d8 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Vartotojai",
"Admin" => "Administravimas",
"Failed to upgrade \"%s\"." => "Nepavyko pakelti „%s“ versijos.",
-"Custom profile pictures don't work with encryption yet" => "Saviti profilio paveiksliukai dar neveikia su šifravimu",
"Unknown filetype" => "Nežinomas failo tipas",
"Invalid image" => "Netinkamas paveikslėlis",
"web services under your control" => "jūsų valdomos web paslaugos",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index d6dc9845d58..91ce25c13cc 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Gebruikers",
"Admin" => "Beheerder",
"Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.",
-"Custom profile pictures don't work with encryption yet" => "Maatwerk profielafbeelding werkt nog niet met versleuteling",
"Unknown filetype" => "Onbekend bestandsformaat",
"Invalid image" => "Ongeldige afbeelding",
"web services under your control" => "Webdiensten in eigen beheer",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 270559b4e50..72f01d784c4 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Użytkownicy",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Błąd przy aktualizacji \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze",
"Unknown filetype" => "Nieznany typ pliku",
"Invalid image" => "Błędne zdjęcie",
"web services under your control" => "Kontrolowane serwisy",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 59bc7831619..784f9fe9f66 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Usuários",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Falha na atualização de \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Fotos de perfil personalizados ainda não funcionam com criptografia",
"Unknown filetype" => "Tipo de arquivo desconhecido",
"Invalid image" => "Imagem inválida",
"web services under your control" => "serviços web sob seu controle",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index c52248273a6..e77daa7dfdb 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Пользователи",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Пользовательские картинки профиля ещё не поддерживают шифрование",
"Unknown filetype" => "Неизвестный тип файла",
"Invalid image" => "Изображение повреждено",
"web services under your control" => "веб-сервисы под вашим управлением",
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
new file mode 100644
index 00000000000..c1ebdd14951
--- /dev/null
+++ b/lib/l10n/ru_RU.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Settings" => "Настройки",
+"Files" => "Файлы",
+"_%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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index d2476c5a2bb..494a34075b9 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -8,6 +8,8 @@ $TRANSLATIONS = array(
"Users" => "Používatelia",
"Admin" => "Administrátor",
"Failed to upgrade \"%s\"." => "Zlyhala aktualizácia \"%s\".",
+"Unknown filetype" => "Neznámy typ súboru",
+"Invalid image" => "Chybný obrázok",
"web services under your control" => "webové služby pod Vašou kontrolou",
"cannot open \"%s\"" => "nemožno otvoriť \"%s\"",
"ZIP download is turned off." => "Sťahovanie súborov ZIP je vypnuté.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 8ce6d005ca4..5432eed5858 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Användare",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Misslyckades med att uppgradera \"%s\".",
-"Custom profile pictures don't work with encryption yet" => "Anpassningsbara profilbilder fungerar inte med kryptering ännu.",
"Unknown filetype" => "Okänd filtyp",
"Invalid image" => "Ogiltig bild",
"web services under your control" => "webbtjänster under din kontroll",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 80288ed0516..eb838f6c537 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "Kullanıcılar",
"Admin" => "Yönetici",
"Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.",
-"Custom profile pictures don't work with encryption yet" => "Hala özel profil resminiz şifreleme ile çalışmıyor",
"Unknown filetype" => "Bilinmeyen dosya türü",
"Invalid image" => "Geçersiz resim",
"web services under your control" => "Bilgileriniz güvenli ve şifreli",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index e56a451f8a9..0081a37dadd 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Users" => "使用者",
"Admin" => "管理",
"Failed to upgrade \"%s\"." => "升級失敗:%s",
-"Custom profile pictures don't work with encryption yet" => "自訂大頭貼暫時不能和加密功能同時使用",
"Unknown filetype" => "未知的檔案類型",
"Invalid image" => "無效的圖片",
"web services under your control" => "由您控制的網路服務",
diff --git a/lib/private/app.php b/lib/private/app.php
index 1a242ad968e..6f45b6e6dd7 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -770,12 +770,12 @@ class OC_App{
}
// prio 2: shipped
- if ($a['shipped'] != $b['shipped']) {
- $atemp = ($a['shipped'] == true ? 1 : 0);
- $btemp = ($b['shipped'] == true ? 1 : 0);
- return ($btemp - $atemp);
+ $ashipped = (array_key_exists('shipped', $a) && $a['shipped'] === 'true') ? 1 : 0;
+ $bshipped = (array_key_exists('shipped', $b) && $b['shipped'] === 'true') ? 1 : 0;
+ if ($ashipped !== $bshipped) {
+ return ($bshipped - $ashipped);
}
-
+
// prio 3: recommended
if ($a['internalclass'] != $b['internalclass']) {
$atemp = ($a['internalclass'] == 'recommendedapp' ? 1 : 0);
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index e615d838173..4f170e054e9 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -134,6 +134,12 @@ class OC_Appconfig{
.' WHERE `appid` = ? AND `configkey` = ?' );
$query->execute( array( $value, $app, $key ));
}
+ // TODO where should this be documented?
+ \OC_Hook::emit('OC_Appconfig', 'post_set_value', array(
+ 'app' => $app,
+ 'key' => $key,
+ 'value' => $value
+ ));
}
/**
diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php
new file mode 100644
index 00000000000..41e8885917a
--- /dev/null
+++ b/lib/private/connector/sabre/server.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * ownCloud / SabreDAV
+ *
+ * @author Markus Goetz
+ *
+ * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+
+/**
+ * Class OC_Connector_Sabre_Server
+ *
+ * This class reimplements some methods from @see Sabre_DAV_Server.
+ *
+ * Basically we add handling of depth: infinity.
+ *
+ * The right way to handle this would have been to submit a patch to the upstream project
+ * and grab the corresponding version one merged.
+ *
+ * Due to time constrains and the limitations where we don't want to upgrade 3rdparty code in
+ * this stage of the release cycle we did choose this approach.
+ *
+ * For ownCloud 7 we will upgrade SabreDAV and submit the patch - if needed.
+ *
+ * @see Sabre_DAV_Server
+ */
+class OC_Connector_Sabre_Server extends Sabre_DAV_Server {
+
+ /**
+ * @see Sabre_DAV_Server
+ */
+ protected function httpPropfind($uri) {
+
+ // $xml = new Sabre_DAV_XMLReader(file_get_contents('php://input'));
+ $requestedProperties = $this->parsePropFindRequest($this->httpRequest->getBody(true));
+
+ $depth = $this->getHTTPDepth(1);
+ // The only two options for the depth of a propfind is 0 or 1
+ // if ($depth!=0) $depth = 1;
+
+ $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
+
+ // This is a multi-status response
+ $this->httpResponse->sendStatus(207);
+ $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+ $this->httpResponse->setHeader('Vary','Brief,Prefer');
+
+ // Normally this header is only needed for OPTIONS responses, however..
+ // iCal seems to also depend on these being set for PROPFIND. Since
+ // this is not harmful, we'll add it.
+ $features = array('1','3', 'extended-mkcol');
+ foreach($this->plugins as $plugin) {
+ $features = array_merge($features,$plugin->getFeatures());
+ }
+
+ $this->httpResponse->setHeader('DAV',implode(', ',$features));
+
+ $prefer = $this->getHTTPPrefer();
+ $minimal = $prefer['return-minimal'];
+
+ $data = $this->generateMultiStatus($newProperties, $minimal);
+ $this->httpResponse->sendBody($data);
+
+ }
+
+ /**
+ * Small helper to support PROPFIND with DEPTH_INFINITY.
+ */
+ private function addPathNodesRecursively(&$nodes, $path) {
+ foreach($this->tree->getChildren($path) as $childNode) {
+ $nodes[$path . '/' . $childNode->getName()] = $childNode;
+ if ($childNode instanceof Sabre_DAV_ICollection)
+ $this->addPathNodesRecursively($nodes, $path . '/' . $childNode->getName());
+ }
+ }
+
+ public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
+
+ // if ($depth!=0) $depth = 1;
+
+ $path = rtrim($path,'/');
+
+ $returnPropertyList = array();
+
+ $parentNode = $this->tree->getNodeForPath($path);
+ $nodes = array(
+ $path => $parentNode
+ );
+ if ($depth==1 && $parentNode instanceof Sabre_DAV_ICollection) {
+ foreach($this->tree->getChildren($path) as $childNode)
+ $nodes[$path . '/' . $childNode->getName()] = $childNode;
+ } else if ($depth == self::DEPTH_INFINITY && $parentNode instanceof Sabre_DAV_ICollection) {
+ $this->addPathNodesRecursively($nodes, $path);
+ }
+
+ // If the propertyNames array is empty, it means all properties are requested.
+ // We shouldn't actually return everything we know though, and only return a
+ // sensible list.
+ $allProperties = count($propertyNames)==0;
+
+ foreach($nodes as $myPath=>$node) {
+
+ $currentPropertyNames = $propertyNames;
+
+ $newProperties = array(
+ '200' => array(),
+ '404' => array(),
+ );
+
+ if ($allProperties) {
+ // Default list of propertyNames, when all properties were requested.
+ $currentPropertyNames = array(
+ '{DAV:}getlastmodified',
+ '{DAV:}getcontentlength',
+ '{DAV:}resourcetype',
+ '{DAV:}quota-used-bytes',
+ '{DAV:}quota-available-bytes',
+ '{DAV:}getetag',
+ '{DAV:}getcontenttype',
+ );
+ }
+
+ // If the resourceType was not part of the list, we manually add it
+ // and mark it for removal. We need to know the resourcetype in order
+ // to make certain decisions about the entry.
+ // WebDAV dictates we should add a / and the end of href's for collections
+ $removeRT = false;
+ if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
+ $currentPropertyNames[] = '{DAV:}resourcetype';
+ $removeRT = true;
+ }
+
+ $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
+ // If this method explicitly returned false, we must ignore this
+ // node as it is inaccessible.
+ if ($result===false) continue;
+
+ if (count($currentPropertyNames) > 0) {
+
+ if ($node instanceof Sabre_DAV_IProperties) {
+ $nodeProperties = $node->getProperties($currentPropertyNames);
+
+ // The getProperties method may give us too much,
+ // properties, in case the implementor was lazy.
+ //
+ // So as we loop through this list, we will only take the
+ // properties that were actually requested and discard the
+ // rest.
+ foreach($currentPropertyNames as $k=>$currentPropertyName) {
+ if (isset($nodeProperties[$currentPropertyName])) {
+ unset($currentPropertyNames[$k]);
+ $newProperties[200][$currentPropertyName] = $nodeProperties[$currentPropertyName];
+ }
+ }
+
+ }
+
+ }
+
+ foreach($currentPropertyNames as $prop) {
+
+ if (isset($newProperties[200][$prop])) continue;
+
+ switch($prop) {
+ case '{DAV:}getlastmodified' : if ($node->getLastModified()) $newProperties[200][$prop] = new Sabre_DAV_Property_GetLastModified($node->getLastModified()); break;
+ case '{DAV:}getcontentlength' :
+ if ($node instanceof Sabre_DAV_IFile) {
+ $size = $node->getSize();
+ if (!is_null($size)) {
+ $newProperties[200][$prop] = (int)$node->getSize();
+ }
+ }
+ break;
+ case '{DAV:}quota-used-bytes' :
+ if ($node instanceof Sabre_DAV_IQuota) {
+ $quotaInfo = $node->getQuotaInfo();
+ $newProperties[200][$prop] = $quotaInfo[0];
+ }
+ break;
+ case '{DAV:}quota-available-bytes' :
+ if ($node instanceof Sabre_DAV_IQuota) {
+ $quotaInfo = $node->getQuotaInfo();
+ $newProperties[200][$prop] = $quotaInfo[1];
+ }
+ break;
+ case '{DAV:}getetag' : if ($node instanceof Sabre_DAV_IFile && $etag = $node->getETag()) $newProperties[200][$prop] = $etag; break;
+ case '{DAV:}getcontenttype' : if ($node instanceof Sabre_DAV_IFile && $ct = $node->getContentType()) $newProperties[200][$prop] = $ct; break;
+ case '{DAV:}supported-report-set' :
+ $reports = array();
+ foreach($this->plugins as $plugin) {
+ $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
+ }
+ $newProperties[200][$prop] = new Sabre_DAV_Property_SupportedReportSet($reports);
+ break;
+ case '{DAV:}resourcetype' :
+ $newProperties[200]['{DAV:}resourcetype'] = new Sabre_DAV_Property_ResourceType();
+ foreach($this->resourceTypeMapping as $className => $resourceType) {
+ if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
+ }
+ break;
+
+ }
+
+ // If we were unable to find the property, we will list it as 404.
+ if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
+
+ }
+
+ $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties, $node));
+
+ $newProperties['href'] = trim($myPath,'/');
+
+ // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
+ // Apple's iCal also requires a trailing slash for principals (rfc 3744), though this is non-standard.
+ if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype'])) {
+ $rt = $newProperties[200]['{DAV:}resourcetype'];
+ if ($rt->is('{DAV:}collection') || $rt->is('{DAV:}principal')) {
+ $newProperties['href'] .='/';
+ }
+ }
+
+ // If the resourcetype property was manually added to the requested property list,
+ // we will remove it again.
+ if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
+
+ $returnPropertyList[] = $newProperties;
+
+ }
+
+ return $returnPropertyList;
+
+ }
+}
diff --git a/lib/private/davclient.php b/lib/private/davclient.php
new file mode 100644
index 00000000000..28f48f3b921
--- /dev/null
+++ b/lib/private/davclient.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Vincent Petry
+ * @copyright 2013 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * This class extends the SabreDAV client with additional functionality
+ * like request timeout.
+ */
+
+class OC_DAVClient extends \Sabre_DAV_Client {
+
+ protected $requestTimeout;
+
+ /**
+ * @brief Sets the request timeout or 0 to disable timeout.
+ * @param int timeout in seconds or 0 to disable
+ */
+ public function setRequestTimeout($timeout) {
+ $this->requestTimeout = (int)$timeout;
+ }
+
+ protected function curlRequest($url, $settings) {
+ if ($this->requestTimeout > 0) {
+ $settings[CURLOPT_TIMEOUT] = $this->requestTimeout;
+ }
+ return parent::curlRequest($url, $settings);
+ }
+}
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 8e76f46c78f..fc13e881bff 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -53,7 +53,7 @@ class MDB2SchemaManager {
* @param string $file file to read structure from
* @return bool
*/
- public function updateDbFromStructure($file) {
+ public function updateDbFromStructure($file, $generateSql = false) {
$sm = $this->conn->getSchemaManager();
$fromSchema = $sm->createSchema();
@@ -82,6 +82,10 @@ class MDB2SchemaManager {
$tableDiff->name = $platform->quoteIdentifier($tableDiff->name);
}
+ if ($generateSql) {
+ return $this->generateChangeScript($schemaDiff);
+ }
+
return $this->executeSchemaChange($schemaDiff);
}
@@ -147,4 +151,20 @@ class MDB2SchemaManager {
$this->conn->commit();
return true;
}
+
+ /**
+ * @param \Doctrine\DBAL\Schema\Schema $schema
+ * @return string
+ */
+ public function generateChangeScript($schema) {
+
+ $script = '';
+ $sqls = $schema->toSql($this->conn->getDatabasePlatform());
+ foreach($sqls as $sql) {
+ $script .= $sql . ';';
+ $script .= PHP_EOL;
+ }
+
+ return $script;
+ }
}
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index a408e3830d6..036c93cd8e1 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -61,6 +61,7 @@ class OC_Log_Owncloud {
$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time->format($format));
$entry = json_encode($entry);
$handle = @fopen(self::$logFile, 'a');
+ @chmod(self::$logFile, 0640);
if ($handle) {
fwrite($handle, $entry."\n");
fclose($handle);
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index c318137ff0e..4d85e23c63c 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -8,40 +8,44 @@
*/
namespace OC\Preview;
-$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
-$whichAVCONV = shell_exec('which avconv');
-$isAVCONVAvailable = !empty($whichAVCONV);
+// movie preview is currently not supported on Windows
+if (!\OC_Util::runningOnWindows()) {
+ $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
+ $whichAVCONV = ($isShellExecEnabled ? shell_exec('which avconv') : '');
+ $isAVCONVAvailable = !empty($whichAVCONV);
-if($isShellExecEnabled && $isAVCONVAvailable) {
+ if($isShellExecEnabled && $isAVCONVAvailable) {
- class Movie extends Provider {
+ class Movie extends Provider {
- public function getMimeType() {
- return '/video\/.*/';
- }
+ public function getMimeType() {
+ return '/video\/.*/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $absPath = \OC_Helper::tmpFile();
+ $tmpPath = \OC_Helper::tmpFile();
- public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
- $absPath = \OC_Helper::tmpFile();
- $tmpPath = \OC_Helper::tmpFile();
+ $handle = $fileview->fopen($path, 'rb');
- $handle = $fileview->fopen($path, 'rb');
+ $firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
+ file_put_contents($absPath, $firstmb);
- $firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
- file_put_contents($absPath, $firstmb);
+ //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
+ $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
- //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
- $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
-
- shell_exec($cmd);
+ shell_exec($cmd);
- $image = new \OC_Image($tmpPath);
+ $image = new \OC_Image($tmpPath);
- unlink($absPath);
- unlink($tmpPath);
+ unlink($absPath);
+ unlink($tmpPath);
- return $image->valid() ? $image : false;
+ return $image->valid() ? $image : false;
+ }
}
+
+ \OC\Preview::registerProvider('OC\Preview\Movie');
}
+}
- \OC\Preview::registerProvider('OC\Preview\Movie');
-} \ No newline at end of file
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index 112909d6523..8f2e06c050b 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -7,128 +7,132 @@
*/
namespace OC\Preview;
-//we need imagick to convert
-class Office extends Provider {
+// office preview is currently not supported on Windows
+if (!\OC_Util::runningOnWindows()) {
- private $cmd;
+ //we need imagick to convert
+ class Office extends Provider {
- public function getMimeType() {
- return null;
- }
+ private $cmd;
- public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
- $this->initCmd();
- if(is_null($this->cmd)) {
- return false;
+ public function getMimeType() {
+ return null;
}
- $absPath = $fileview->toTmpFile($path);
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $this->initCmd();
+ if(is_null($this->cmd)) {
+ return false;
+ }
+
+ $absPath = $fileview->toTmpFile($path);
+
+ $tmpDir = get_temp_dir();
- $tmpDir = get_temp_dir();
+ $defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
+ $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
- $defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
- $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
+ $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+ $export = 'export HOME=/' . $tmpDir;
- $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
- $export = 'export HOME=/' . $tmpDir;
+ shell_exec($export . "\n" . $exec);
- shell_exec($export . "\n" . $exec);
+ //create imagick object from pdf
+ try{
+ $pdf = new \imagick($absPath . '.pdf' . '[0]');
+ $pdf->setImageFormat('jpg');
+ } catch (\Exception $e) {
+ unlink($absPath);
+ unlink($absPath . '.pdf');
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+ return false;
+ }
+
+ $image = new \OC_Image($pdf);
- //create imagick object from pdf
- try{
- $pdf = new \imagick($absPath . '.pdf' . '[0]');
- $pdf->setImageFormat('jpg');
- } catch (\Exception $e) {
unlink($absPath);
unlink($absPath . '.pdf');
- \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
- return false;
+
+ return $image->valid() ? $image : false;
}
- $image = new \OC_Image($pdf);
+ private function initCmd() {
+ $cmd = '';
- unlink($absPath);
- unlink($absPath . '.pdf');
+ if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
+ $cmd = \OC_Config::getValue('preview_libreoffice_path', null);
+ }
- return $image->valid() ? $image : false;
- }
+ $whichLibreOffice = shell_exec('which libreoffice');
+ if($cmd === '' && !empty($whichLibreOffice)) {
+ $cmd = 'libreoffice';
+ }
- private function initCmd() {
- $cmd = '';
+ $whichOpenOffice = shell_exec('which openoffice');
+ if($cmd === '' && !empty($whichOpenOffice)) {
+ $cmd = 'openoffice';
+ }
- if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
- $cmd = \OC_Config::getValue('preview_libreoffice_path', null);
- }
+ if($cmd === '') {
+ $cmd = null;
+ }
- $whichLibreOffice = shell_exec('which libreoffice');
- if($cmd === '' && !empty($whichLibreOffice)) {
- $cmd = 'libreoffice';
+ $this->cmd = $cmd;
}
+ }
- $whichOpenOffice = shell_exec('which openoffice');
- if($cmd === '' && !empty($whichOpenOffice)) {
- $cmd = 'openoffice';
- }
+ //.doc, .dot
+ class MSOfficeDoc extends Office {
- if($cmd === '') {
- $cmd = null;
+ public function getMimeType() {
+ return '/application\/msword/';
}
- $this->cmd = $cmd;
- }
-}
-
-//.doc, .dot
-class MSOfficeDoc extends Office {
-
- public function getMimeType() {
- return '/application\/msword/';
}
-}
+ \OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
-\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
+ //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
+ class MSOffice2003 extends Office {
-//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
-class MSOffice2003 extends Office {
+ public function getMimeType() {
+ return '/application\/vnd.ms-.*/';
+ }
- public function getMimeType() {
- return '/application\/vnd.ms-.*/';
}
-}
+ \OC\Preview::registerProvider('OC\Preview\MSOffice2003');
-\OC\Preview::registerProvider('OC\Preview\MSOffice2003');
+ //.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
+ class MSOffice2007 extends Office {
-//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
-class MSOffice2007 extends Office {
+ public function getMimeType() {
+ return '/application\/vnd.openxmlformats-officedocument.*/';
+ }
- public function getMimeType() {
- return '/application\/vnd.openxmlformats-officedocument.*/';
}
-}
+ \OC\Preview::registerProvider('OC\Preview\MSOffice2007');
-\OC\Preview::registerProvider('OC\Preview\MSOffice2007');
+ //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
+ class OpenDocument extends Office {
-//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
-class OpenDocument extends Office {
+ public function getMimeType() {
+ return '/application\/vnd.oasis.opendocument.*/';
+ }
- public function getMimeType() {
- return '/application\/vnd.oasis.opendocument.*/';
}
-}
+ \OC\Preview::registerProvider('OC\Preview\OpenDocument');
-\OC\Preview::registerProvider('OC\Preview\OpenDocument');
+ //.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
+ class StarOffice extends Office {
-//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
-class StarOffice extends Office {
+ public function getMimeType() {
+ return '/application\/vnd.sun.xml.*/';
+ }
- public function getMimeType() {
- return '/application\/vnd.sun.xml.*/';
}
+ \OC\Preview::registerProvider('OC\Preview\StarOffice');
}
-
-\OC\Preview::registerProvider('OC\Preview\StarOffice'); \ No newline at end of file
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 5287bbd6ac1..318ab51f851 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -8,15 +8,22 @@
//both, libreoffice backend and php fallback, need imagick
if (extension_loaded('imagick')) {
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
- $whichLibreOffice = shell_exec('which libreoffice');
- $isLibreOfficeAvailable = !empty($whichLibreOffice);
- $whichOpenOffice = shell_exec('which libreoffice');
- $isOpenOfficeAvailable = !empty($whichOpenOffice);
- //let's see if there is libreoffice or openoffice on this machine
- if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
- require_once('office-cl.php');
- }else{
+
+ // LibreOffice preview is currently not supported on Windows
+ if (!\OC_Util::runningOnWindows()) {
+ $whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
+ $isLibreOfficeAvailable = !empty($whichLibreOffice);
+ $whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
+ $isOpenOfficeAvailable = !empty($whichOpenOffice);
+ //let's see if there is libreoffice or openoffice on this machine
+ if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
+ require_once('office-cl.php');
+ }else{
+ //in case there isn't, use our fallback
+ require_once('office-fallback.php');
+ }
+ } else {
//in case there isn't, use our fallback
require_once('office-fallback.php');
}
-} \ No newline at end of file
+}
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index e4a730bafc8..65d09705f40 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -11,9 +11,15 @@ abstract class Provider {
abstract public function getMimeType();
/**
- * search for $query
- * @param string $query
- * @return
+ * get thumbnail for file at path $path
+ * @param string $path Path of file
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param bool $scalingUp Disable/Enable upscaling of previews
+ * @param object $fileview fileview object of user folder
+ * @return mixed
+ * false if no preview was generated
+ * OC_Image object of the preview
*/
abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
}
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 77e728eb364..c9aa20968d8 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -9,20 +9,19 @@ namespace OC\Preview;
class TXT extends Provider {
- private static $blacklist = array(
- 'text/calendar',
- 'text/vcard',
- );
-
public function getMimeType() {
- return '/text\/.*/';
+ return '/text\/plain/';
}
+ /**
+ * @param string $path
+ * @param int $maxX
+ * @param int $maxY
+ * @param boolean $scalingup
+ * @param \OC\Files\View $fileview
+ * @return bool|\OC_Image
+ */
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
- $mimetype = $fileview->getMimeType($path);
- if(in_array($mimetype, self::$blacklist)) {
- return false;
- }
$content = $fileview->fopen($path, 'r');
$content = stream_get_contents($content);
@@ -62,22 +61,12 @@ class TXT extends Provider {
\OC\Preview::registerProvider('OC\Preview\TXT');
-class PHP extends TXT {
-
- public function getMimeType() {
- return '/application\/x-php/';
- }
-
-}
-
-\OC\Preview::registerProvider('OC\Preview\PHP');
-
-class JavaScript extends TXT {
+class MarkDown extends TXT {
public function getMimeType() {
- return '/application\/javascript/';
+ return '/text\/(x-)?markdown/';
}
}
-\OC\Preview::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\MarkDown');
diff --git a/lib/private/preview/unknown.php b/lib/private/preview/unknown.php
index 9e6cd68d401..4747f9e25ed 100644
--- a/lib/private/preview/unknown.php
+++ b/lib/private/preview/unknown.php
@@ -20,8 +20,30 @@ class Unknown extends Provider {
$path = \OC_Helper::mimetypeIcon($mimetype);
$path = \OC::$SERVERROOT . substr($path, strlen(\OC::$WEBROOT));
- return new \OC_Image($path);
+ $svgPath = substr_replace($path, 'svg', -3);
+
+ if (extension_loaded('imagick') && file_exists($svgPath)) {
+
+ // http://www.php.net/manual/de/imagick.setresolution.php#85284
+ $svg = new \Imagick();
+ $svg->readImage($svgPath);
+ $res = $svg->getImageResolution();
+ $x_ratio = $res['x'] / $svg->getImageWidth();
+ $y_ratio = $res['y'] / $svg->getImageHeight();
+ $svg->removeImage();
+ $svg->setResolution($maxX * $x_ratio, $maxY * $y_ratio);
+ $svg->setBackgroundColor(new \ImagickPixel('transparent'));
+ $svg->readImage($svgPath);
+ $svg->setImageFormat('png32');
+
+ $image = new \OC_Image();
+ $image->loadFromData($svg);
+ } else {
+ $image = new \OC_Image($path);
+ }
+
+ return $image;
}
}
-\OC\Preview::registerProvider('OC\Preview\Unknown'); \ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\Unknown');
diff --git a/lib/private/util.php b/lib/private/util.php
index 6c0a8d7bab5..885cce87541 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -754,6 +754,10 @@ class OC_Util {
* file in the data directory and trying to access via http
*/
public static function isHtAccessWorking() {
+ if (!\OC_Config::getValue("check_for_working_htaccess", true)) {
+ return true;
+ }
+
// testdata
$fileName = '/htaccesstest.txt';
$testContent = 'testcontent';
@@ -802,11 +806,16 @@ class OC_Util {
if (!function_exists('curl_init')) {
return true;
}
+ if (!\OC_Config::getValue("check_for_working_webdav", true)) {
+ return true;
+ }
$settings = array(
'baseUri' => OC_Helper::linkToRemote('webdav'),
);
- $client = new \Sabre_DAV_Client($settings);
+ $client = new \OC_DAVClient($settings);
+
+ $client->setRequestTimeout(10);
// for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
$client->setVerifyPeer(false);
diff --git a/lib/public/app.php b/lib/public/app.php
index 0a5721b334e..18681670ddd 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -35,14 +35,12 @@ namespace OCP;
*/
class App {
/**
- * @brief Makes ownCloud aware of this app
- * @brief This call is deprecated and not necessary to use.
- * @param $data array with all information
- * @returns boolean
+ * Makes ownCloud aware of this app
+ * @param array with all information
+ * @return boolean
*
- * @deprecated this method is deprecated
- * Do not call it anymore
- * It'll remain in our public API for compatibility reasons
+ * @deprecated This method is deprecated. Do not call it anymore.
+ * It'll remain in our public API for compatibility reasons.
*
*/
public static function register( $data ) {
@@ -50,9 +48,9 @@ class App {
}
/**
- * @brief adds an entry to the navigation
- * @param $data array containing the data
- * @returns boolean
+ * Adds an entry to the navigation
+ * @param array containing the data
+ * @return boolean
*
* This function adds a new entry to the navigation visible to users. $data
* is an associative array.
@@ -71,9 +69,9 @@ class App {
}
/**
- * @brief marks a navigation entry as active
- * @param $id string id of the entry
- * @returns boolean
+ * Marks a navigation entry as active
+ * @param string id of the entry
+ * @return boolean
*
* This function sets a navigation entry as active and removes the 'active'
* property from all other entries. The templates can use this for
@@ -84,7 +82,7 @@ class App {
}
/**
- * @brief Register a Configuration Screen that should appear in the personal settings section.
+ * Register a Configuration Screen that should appear in the personal settings section.
* @param $app string appid
* @param $page string page to be included
*/
@@ -93,7 +91,7 @@ class App {
}
/**
- * @brief Register a Configuration Screen that should appear in the Admin section.
+ * Register a Configuration Screen that should appear in the Admin section.
* @param $app string appid
* @param $page string page to be included
*/
@@ -102,19 +100,19 @@ class App {
}
/**
- * @brief Read app metadata from the info.xml file
+ * Read app metadata from the info.xml file
* @param string $app id of the app or the path of the info.xml file
* @param boolean $path (optional)
- * @returns array
+ * @return array
*/
public static function getAppInfo( $app, $path=false ) {
return \OC_App::getAppInfo( $app, $path);
}
/**
- * @brief checks whether or not an app is enabled
- * @param $app app
- * @returns boolean
+ * checks whether or not an app is enabled
+ * @param string
+ * @return boolean
*
* This function checks whether or not an app is enabled.
*/
@@ -123,17 +121,17 @@ class App {
}
/**
- * @brief Check if the app is enabled, redirects to home if not
- * @param $app app
+ * Check if the app is enabled, redirects to home if not
+ * @param string
*/
public static function checkAppEnabled( $app ) {
\OC_Util::checkAppEnabled( $app );
}
/**
- * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
- * @param $app app
- * @returns boolean
+ * Get the last version of the app, either from appinfo/version or from appinfo/info.xml
+ * @param string
+ * @return boolean
*/
public static function getAppVersion( $app ) {
return \OC_App::getAppVersion( $app );
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 64477258948..5ca389b9946 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -26,12 +26,15 @@ namespace OCP\AppFramework\Http;
/**
- * Base class for responses. Also used to just send headers
+ * Base class for responses. Also used to just send headers.
+ *
+ * It handles headers, HTTP status code, last modified and ETag.
*/
class Response {
/**
- * @var array default headers
+ * Headers - defaults to ['Cache-Control' => 'no-cache, must-revalidate']
+ * @var array
*/
private $headers = array(
'Cache-Control' => 'no-cache, must-revalidate'
@@ -39,18 +42,21 @@ class Response {
/**
+ * HTTP status code - defaults to STATUS OK
* @var string
*/
private $status = Http::STATUS_OK;
/**
+ * Last modified date
* @var \DateTime
*/
private $lastModified;
/**
+ * ETag
* @var string
*/
private $ETag;
@@ -135,6 +141,7 @@ class Response {
/**
+ * Get the ETag
* @return string the etag
*/
public function getETag() {
@@ -143,6 +150,7 @@ class Response {
/**
+ * Get "last modified" date
* @return string RFC2822 formatted last modified date
*/
public function getLastModified() {
@@ -151,6 +159,7 @@ class Response {
/**
+ * Set the ETag
* @param string $ETag
*/
public function setETag($ETag) {
@@ -159,6 +168,7 @@ class Response {
/**
+ * Set "last modified" date
* @param \DateTime $lastModified
*/
public function setLastModified($lastModified) {
diff --git a/lib/public/config.php b/lib/public/config.php
index 73476d7551d..74aaa4e1891 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -40,7 +40,7 @@ namespace OCP;
*/
class Config {
/**
- * @brief Gets a value from config.php
+ * Gets a value from config.php
* @param string $key key
* @param string $default = null default value
* @return string the value or $default
@@ -53,7 +53,7 @@ class Config {
}
/**
- * @brief Sets a value
+ * Sets a value
* @param string $key key
* @param string $value value
* @return bool
@@ -71,7 +71,7 @@ class Config {
}
/**
- * @brief Gets the config value
+ * Gets the config value
* @param string $app app
* @param string $key key
* @param string $default = null, default value if the key does not exist
@@ -85,7 +85,7 @@ class Config {
}
/**
- * @brief sets a value in the appconfig
+ * Sets a value in the appconfig
* @param string $app app
* @param string $key key
* @param string $value value
@@ -103,7 +103,7 @@ class Config {
}
/**
- * @brief Gets the preference
+ * Gets the preference
* @param string $user user
* @param string $app app
* @param string $key key
@@ -118,12 +118,12 @@ class Config {
}
/**
- * @brief sets a value in the preferences
+ * Sets a value in the preferences
* @param string $user user
* @param string $app app
* @param string $key key
* @param string $value value
- * @returns bool
+ * @return bool
*
* Adds a value to the preferences. If the key did not exist before, it
* will be added automagically.
diff --git a/lib/public/db.php b/lib/public/db.php
index 9512cca2d19..fc6621f5b51 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -35,7 +35,7 @@ namespace OCP;
*/
class DB {
/**
- * @brief Prepare a SQL query
+ * Prepare a SQL query
* @param string $query Query string
* @return \MDB2_Statement_Common prepared SQL query
*
@@ -46,7 +46,7 @@ class DB {
}
/**
- * @brief Insert a row if a matching row doesn't exists.
+ * Insert a row if a matching row doesn't exists.
* @param $table string The table name (will replace *PREFIX*) to perform the replace on.
* @param $input array
*
@@ -67,7 +67,7 @@ class DB {
}
/**
- * @brief gets last value of autoincrement
+ * Gets last value of autoincrement
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
* @return int
*
@@ -81,21 +81,21 @@ class DB {
}
/**
- * @brief Start a transaction
+ * Start a transaction
*/
public static function beginTransaction() {
return(\OC_DB::beginTransaction());
}
/**
- * @brief Commit the database changes done during a transaction that is in progress
+ * Commit the database changes done during a transaction that is in progress
*/
public static function commit() {
return(\OC_DB::commit());
}
/**
- * @brief check if a result is an error, works with MDB2 and PDOException
+ * Check if a result is an error, works with MDB2 and PDOException
* @param mixed $result
* @return bool
*/
diff --git a/lib/public/files.php b/lib/public/files.php
index 852b041eefb..1e4c25c5ef1 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -36,9 +36,8 @@ namespace OCP;
*/
class Files {
/**
- * @brief Recusive deletion of folders
- * @param string $dir path to the folder
- *
+ * Recusive deletion of folders
+ * @param string path to the folder
* @return bool
*/
static function rmdirr( $dir ) {
@@ -46,7 +45,7 @@ class Files {
}
/**
- * get the mimetype form a local file
+ * Get the mimetype form a local file
* @param string path
* @return string
* does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
@@ -56,17 +55,16 @@ class Files {
}
/**
- * search for files by mimetype
- *
- * @param string $query
+ * Search for files by mimetype
+ * @param string mimetype
* @return array
*/
- static public function searchByMime($mimetype) {
+ static public function searchByMime( $mimetype ) {
return(\OC\Files\Filesystem::searchByMime( $mimetype ));
}
/**
- * copy the contents of one stream to another
+ * Copy the contents of one stream to another
* @param resource source
* @param resource target
* @return int the number of bytes copied
@@ -77,7 +75,7 @@ class Files {
}
/**
- * create a temporary file with an unique filename
+ * Create a temporary file with an unique filename
* @param string postfix
* @return string
*
@@ -88,7 +86,7 @@ class Files {
}
/**
- * create a temporary folder with an unique filename
+ * Create a temporary folder with an unique filename
* @return string
*
* temporary files are automatically cleaned up after the script is finished
@@ -99,9 +97,8 @@ class Files {
/**
* Adds a suffix to the name in case the file exists
- *
- * @param $path
- * @param $filename
+ * @param string path
+ * @param string filename
* @return string
*/
public static function buildNotExistingFileName( $path, $filename ) {
@@ -109,8 +106,9 @@ class Files {
}
/**
+ * Gets the Storage for an app - creates the needed folder if they are not
+ * existant
* @param string appid
- * @param $app app
* @return \OC\Files\View
*/
public static function getStorage( $app ) {
diff --git a/lib/public/icache.php b/lib/public/icache.php
index 436ee71b2b9..a73004ec9a7 100644
--- a/lib/public/icache.php
+++ b/lib/public/icache.php
@@ -14,7 +14,6 @@ interface ICache {
/**
* Get a value from the user cache
- *
* @param string $key
* @return mixed
*/
@@ -22,7 +21,6 @@ interface ICache {
/**
* Set a value in the user cache
- *
* @param string $key
* @param mixed $value
* @param int $ttl Time To Live in seconds. Defaults to 60*60*24
@@ -32,7 +30,6 @@ interface ICache {
/**
* Check if a value is set in the user cache
- *
* @param string $key
* @return bool
*/
@@ -40,14 +37,13 @@ interface ICache {
/**
* Remove an item from the user cache
- *
* @param string $key
* @return bool
*/
public function remove($key);
/**
- * clear the user cache of all entries starting with a prefix
+ * Clear the user cache of all entries starting with a prefix
* @param string $prefix (optional)
* @return bool
*/
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index c741a0f061a..252902eda6c 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -4,7 +4,7 @@
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
- *
+ *
*/
namespace OCP;
@@ -30,9 +30,9 @@ interface IDBConnection {
public function lastInsertId($table = null);
/**
- * @brief Insert a row if a matching row doesn't exists.
- * @param $table string The table name (will replace *PREFIX*) to perform the replace on.
- * @param $input array
+ * Insert a row if a matching row doesn't exists.
+ * @param string The table name (will replace *PREFIX*) to perform the replace on.
+ * @param array
*
* The input array if in the form:
*
@@ -49,25 +49,25 @@ interface IDBConnection {
public function insertIfNotExist($table, $input);
/**
- * @brief Start a transaction
+ * Start a transaction
* @return bool TRUE on success or FALSE on failure
*/
public function beginTransaction();
/**
- * @brief Commit the database changes done during a transaction that is in progress
+ * Commit the database changes done during a transaction that is in progress
* @return bool TRUE on success or FALSE on failure
*/
public function commit();
/**
- * @brief Rollback the database changes done during a transaction that is in progress
+ * Rollback the database changes done during a transaction that is in progress
* @return bool TRUE on success or FALSE on failure
*/
public function rollBack();
/**
- * returns the error code and message as a string for logging
+ * Gets the error code and message as a string for logging
* @return string
*/
public function getError();
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 9cf9093d391..805c8988aa2 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -14,7 +14,7 @@ namespace OCP;
*/
interface IL10N {
/**
- * @brief Translating
+ * Translating
* @param $text String The text we need a translation for
* @param array $parameters default:array() Parameters for sprintf
* @return \OC_L10N_String|string Translation or the same text
@@ -25,7 +25,7 @@ interface IL10N {
public function t($text, $parameters = array());
/**
- * @brief Translating
+ * Translating
* @param $text_singular String the string to translate for exactly one object
* @param $text_plural String the string to translate for n objects
* @param $count Integer Number of objects
@@ -42,10 +42,10 @@ interface IL10N {
public function n($text_singular, $text_plural, $count, $parameters = array());
/**
- * @brief Localization
+ * Localization
* @param $type Type of localization
* @param $params parameters for this localization
- * @returns String or false
+ * @return String or false
*
* Returns the localized data.
*
diff --git a/lib/public/response.php b/lib/public/response.php
index de0c3f25347..f7f6afcec95 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -35,7 +35,7 @@ namespace OCP;
*/
class Response {
/**
- * @brief Enable response caching by sending correct HTTP headers
+ * Enable response caching by sending correct HTTP headers
* @param int $cache_time time to cache the response
* >0 cache time in seconds
* 0 and <0 enable default browser caching
@@ -55,7 +55,7 @@ class Response {
}
/**
- * @brief disable browser caching
+ * Disable browser caching
* @see enableCaching with cache_time = 0
*/
static public function disableCaching() {
@@ -72,7 +72,7 @@ class Response {
}
/**
- * @brief Send file as response, checking and setting caching headers
+ * Send file as response, checking and setting caching headers
* @param string $filepath of file to send
*/
static public function sendFile( $filepath ) {
@@ -80,7 +80,7 @@ class Response {
}
/**
- * @brief Set response expire time
+ * Set response expire time
* @param string|\DateTime $expires date-time when the response expires
* string for DateInterval from now
* DateTime object when to expire response
@@ -90,7 +90,7 @@ class Response {
}
/**
- * @brief Send redirect response
+ * Send redirect response
* @param string $location to redirect to
*/
static public function redirect( $location ) {
diff --git a/lib/public/share.php b/lib/public/share.php
index 66605dafee5..59150e1964f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -64,7 +64,7 @@ class Share {
private static $isResharingAllowed;
/**
- * @brief Register a sharing backend class that implements OCP\Share_Backend for an item type
+ * Register a sharing backend class that implements OCP\Share_Backend for an item type
* @param string Item type
* @param string Backend class
* @param string (optional) Depends on item type
@@ -94,11 +94,10 @@ class Share {
}
/**
- * @brief Check if the Share API is enabled
+ * Check if the Share API is enabled
* @return Returns true if enabled or false
*
* The Share API is enabled by default if not configured
- *
*/
public static function isEnabled() {
if (\OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes') == 'yes') {
@@ -108,7 +107,7 @@ class Share {
}
/**
- * @brief Prepare a path to be passed to DB as file_target
+ * Prepare a path to be passed to DB as file_target
* @return string Prepared path
*/
public static function prepFileTarget( $path ) {
@@ -125,7 +124,7 @@ class Share {
}
/**
- * @brief Find which users can access a shared item
+ * Find which users can access a shared item
* @param $path to the file
* @param $user owner of the file
* @param include owner to the list of users with access to the file
@@ -232,7 +231,7 @@ class Share {
}
/**
- * @brief Get the items of item type shared with the current user
+ * Get the items of item type shared with the current user
* @param string Item type
* @param int Format (optional) Format type must be defined by the backend
* @param int Number of items to return (optional) Returns all by default
@@ -245,7 +244,7 @@ class Share {
}
/**
- * @brief Get the item of item type shared with the current user
+ * Get the item of item type shared with the current user
* @param string $itemType
* @param string $ItemTarget
* @param int $format (optional) Format type must be defined by the backend
@@ -258,7 +257,7 @@ class Share {
}
/**
- * @brief Get the item of item type shared with a given user by source
+ * Get the item of item type shared with a given user by source
* @param string $ItemType
* @param string $ItemSource
* @param string $user User user to whom the item was shared
@@ -307,7 +306,7 @@ class Share {
}
/**
- * @brief Get the item of item type shared with the current user by source
+ * Get the item of item type shared with the current user by source
* @param string Item type
* @param string Item source
* @param int Format (optional) Format type must be defined by the backend
@@ -320,7 +319,7 @@ class Share {
}
/**
- * @brief Get the item of item type shared by a link
+ * Get the item of item type shared by a link
* @param string Item type
* @param string Item source
* @param string Owner of link
@@ -332,7 +331,7 @@ class Share {
}
/**
- * @brief Get the item shared by a token
+ * Get the item shared by a token
* @param string token
* @return Item
*/
@@ -357,7 +356,7 @@ class Share {
}
/**
- * @brief resolves reshares down to the last real share
+ * resolves reshares down to the last real share
* @param $linkItem
* @return $fileOwner
*/
@@ -380,7 +379,7 @@ class Share {
/**
- * @brief Get the shared items of item type owned by the current user
+ * Get the shared items of item type owned by the current user
* @param string Item type
* @param int Format (optional) Format type must be defined by the backend
* @param int Number of items to return (optional) Returns all by default
@@ -393,7 +392,7 @@ class Share {
}
/**
- * @brief Get the shared item of item type owned by the current user
+ * Get the shared item of item type owned by the current user
* @param string Item type
* @param string Item source
* @param int Format (optional) Format type must be defined by the backend
@@ -429,7 +428,7 @@ class Share {
}
/**
- * @brief Share an item with a user, group, or via private link
+ * Share an item with a user, group, or via private link
* @param string Item type
* @param string Item source
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -606,7 +605,7 @@ class Share {
}
/**
- * @brief Unshare an item from a user, group, or delete a private link
+ * Unshare an item from a user, group, or delete a private link
* @param string Item type
* @param string Item source
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -639,7 +638,7 @@ class Share {
}
/**
- * @brief Unshare an item from all users, groups, and remove all links
+ * Unshare an item from all users, groups, and remove all links
* @param string Item type
* @param string Item source
* @return Returns true on success or false on failure
@@ -666,7 +665,7 @@ class Share {
}
/**
- * @brief Unshare an item shared with the current user
+ * Unshare an item shared with the current user
* @param string Item type
* @param string Item target
* @return Returns true on success or false on failure
@@ -703,7 +702,7 @@ class Share {
return false;
}
/**
- * @brief sent status if users got informed by mail about share
+ * sent status if users got informed by mail about share
* @param string $itemType
* @param string $itemSource
* @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -727,7 +726,7 @@ class Share {
}
/**
- * @brief Set the permissions of an item for a specific user or group
+ * Set the permissions of an item for a specific user or group
* @param string Item type
* @param string Item source
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -831,7 +830,7 @@ class Share {
}
/**
- * @brief Get the backend class for the specified item type
+ * Get the backend class for the specified item type
* @param string $itemType
* @return Share_Backend
*/
@@ -860,7 +859,7 @@ class Share {
}
/**
- * @brief Check if resharing is allowed
+ * Check if resharing is allowed
* @return Returns true if allowed or false
*
* Resharing is allowed by default if not configured
@@ -878,7 +877,7 @@ class Share {
}
/**
- * @brief Get a list of collection item types for the specified item type
+ * Get a list of collection item types for the specified item type
* @param string Item type
* @return array
*/
@@ -902,7 +901,7 @@ class Share {
}
/**
- * @brief Get shared items from the database
+ * Get shared items from the database
* @param string Item type
* @param string Item source or target (optional)
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
@@ -961,6 +960,10 @@ class Share {
$queryArgs = array($itemType);
}
}
+ if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+ $where .= ' AND `share_type` != ?';
+ $queryArgs[] = self::SHARE_TYPE_LINK;
+ }
if (isset($shareType)) {
// Include all user and group items
if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
@@ -1307,7 +1310,7 @@ class Share {
}
/**
- * @brief Put shared item into the database
+ * Put shared item into the database
* @param string Item type
* @param string Item source
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -1543,7 +1546,7 @@ class Share {
}
/**
- * @brief Generate a unique target for the item
+ * Generate a unique target for the item
* @param string Item type
* @param string Item source
* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
@@ -1659,7 +1662,7 @@ class Share {
}
/**
- * @brief Delete all reshares of an item
+ * Delete all reshares of an item
* @param int Id of item to delete
* @param bool If true, exclude the parent from the delete (optional)
* @param string The user that the parent was shared with (optinal)
@@ -1719,6 +1722,18 @@ class Share {
}
/**
+ * Delete all shares with type SHARE_TYPE_LINK
+ */
+ public static function removeAllLinkShares() {
+ // Delete any link shares
+ $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ?');
+ $result = $query->execute(array(self::SHARE_TYPE_LINK));
+ while ($item = $result->fetchRow()) {
+ self::delete($item['id']);
+ }
+ }
+
+ /**
* Hook Listeners
*/
@@ -1797,7 +1812,7 @@ class Share {
interface Share_Backend {
/**
- * @brief Get the source of the item to be stored in the database
+ * Get the source of the item to be stored in the database
* @param string Item source
* @param string Owner of the item
* @return mixed|array|false Source
@@ -1810,7 +1825,7 @@ interface Share_Backend {
public function isValidSource($itemSource, $uidOwner);
/**
- * @brief Get a unique name of the item for the specified user
+ * Get a unique name of the item for the specified user
* @param string Item source
* @param string|false User the item is being shared with
* @param array|null List of similar item names already existing as shared items
@@ -1822,7 +1837,7 @@ interface Share_Backend {
public function generateTarget($itemSource, $shareWith, $exclude = null);
/**
- * @brief Converts the shared item sources back into the item in the specified format
+ * Converts the shared item sources back into the item in the specified format
* @param array Shared items
* @param int Format
* @return ?
@@ -1853,10 +1868,7 @@ interface Share_Backend {
interface Share_Backend_File_Dependent extends Share_Backend {
/**
- * @brief Get the file path of the item
- * @param
- * @param
- * @return
+ * Get the file path of the item
*/
public function getFilePath($itemSource, $uidOwner);
@@ -1869,7 +1881,7 @@ interface Share_Backend_File_Dependent extends Share_Backend {
interface Share_Backend_Collection extends Share_Backend {
/**
- * @brief Get the sources of the children of the item
+ * Get the sources of the children of the item
* @param string Item source
* @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
*/
diff --git a/lib/public/template.php b/lib/public/template.php
index a5c500b0e25..cf2dc7766f5 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -32,12 +32,12 @@ namespace OCP;
/**
- * @brief make OC_Helper::imagePath available as a simple function
- * @param $app app
- * @param $image image
- * @returns link to the image
+ * Make OC_Helper::imagePath available as a simple function
+ * @param string app
+ * @param string image
+ * @return link to the image
*
- * For further information have a look at OC_Helper::imagePath
+ * @see OC_Helper::imagePath
*/
function image_path( $app, $image ) {
return(\image_path( $app, $image ));
@@ -45,40 +45,39 @@ function image_path( $app, $image ) {
/**
- * @brief make OC_Helper::mimetypeIcon available as a simple function
- * Returns the path to the image of this file type.
- * @param $mimetype mimetype
- * @returns link to the image
+ * Make OC_Helper::mimetypeIcon available as a simple function
+ * @param string mimetype
+ * @return path to the image of this file type.
*/
function mimetype_icon( $mimetype ) {
return(\mimetype_icon( $mimetype ));
}
/**
- * @brief make preview_icon available as a simple function
- * Returns the path to the preview of the image.
- * @param $path path of file
- * @returns link to the preview
+ * Make preview_icon available as a simple function
+ * @param string path of file
+ * @return path to the preview of the image
*/
function preview_icon( $path ) {
return(\preview_icon( $path ));
}
/**
- * @brief make publicpreview_icon available as a simple function
+ * Make publicpreview_icon available as a simple function
* Returns the path to the preview of the image.
- * @param $path path of file
- * @returns link to the preview
+ * @param string path of file
+ * @param string token
+ * @return link to the preview
*/
function publicPreview_icon ( $path, $token ) {
return(\publicPreview_icon( $path, $token ));
}
/**
- * @brief make OC_Helper::humanFileSize available as a simple function
- * Makes 2048 to 2 kB.
- * @param $bytes size in bytes
- * @returns size as string
+ * Make OC_Helper::humanFileSize available as a simple function
+ * Example: 2048 to 2 kB.
+ * @param int size in bytes
+ * @return size as string
*/
function human_file_size( $bytes ) {
return(\human_file_size( $bytes ));
@@ -86,20 +85,21 @@ function human_file_size( $bytes ) {
/**
- * @brief Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
- * @param $timestamp unix timestamp
- * @returns human readable interpretation of the timestamp
+ * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
+ * @param int unix timestamp
+ * @param boolean date only
+ * @return human readable interpretation of the timestamp
*/
-function relative_modified_date($timestamp, $dateOnly = false) {
+function relative_modified_date( $timestamp, $dateOnly = false ) {
return(\relative_modified_date($timestamp, null, $dateOnly));
}
/**
- * @brief DEPRECATED Return a human readable outout for a file size.
+ * Return a human readable outout for a file size.
* @deprecated human_file_size() instead
- * @param $byte size of a file in byte
- * @returns human readable interpretation of a file size
+ * @param integer size of a file in byte
+ * @return human readable interpretation of a file size
*/
function simple_file_size($bytes) {
return(\human_file_size($bytes));
@@ -107,11 +107,11 @@ function simple_file_size($bytes) {
/**
- * @brief Generate html code for an options block.
+ * Generate html code for an options block.
* @param $options the options
* @param $selected which one is selected?
- * @param $params the parameters
- * @returns html options
+ * @param array the parameters
+ * @return html options
*/
function html_select_options($options, $selected, $params=array()) {
return(\html_select_options($options, $selected, $params));
diff --git a/lib/public/user.php b/lib/public/user.php
index 576a64d7048..b4931ecc0fa 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -36,7 +36,7 @@ namespace OCP;
*/
class User {
/**
- * @brief get the user id of the user currently logged in.
+ * Get the user id of the user currently logged in.
* @return string uid or false
*/
public static function getUser() {
@@ -44,45 +44,46 @@ class User {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
- *
- * Get a list of all users.
+ * Get a list of all users
+ * @param string search pattern
+ * @param int limit
+ * @param int offset
+ * @return array with all uids
*/
- public static function getUsers($search = '', $limit = null, $offset = null) {
- return \OC_User::getUsers($search, $limit, $offset);
+ public static function getUsers( $search = '', $limit = null, $offset = null ) {
+ return \OC_User::getUsers( $search, $limit, $offset );
}
/**
- * @brief get the user display name of the user currently logged in.
+ * Get the user display name of the user currently logged in.
+ * @param string user id or null for current user
* @return string display name
*/
- public static function getDisplayName($user=null) {
- return \OC_User::getDisplayName($user);
+ public static function getDisplayName( $user = null ) {
+ return \OC_User::getDisplayName( $user );
}
/**
- * @brief Get a list of all display names
- * @returns array with all display names (value) and the correspondig uids (key)
- *
* Get a list of all display names and user ids.
+ * @param string search pattern
+ * @param int limit
+ * @param int offset
+ * @return array with all display names (value) and the correspondig uids (key)
*/
- public static function getDisplayNames($search = '', $limit = null, $offset = null) {
- return \OC_User::getDisplayNames($search, $limit, $offset);
+ public static function getDisplayNames( $search = '', $limit = null, $offset = null ) {
+ return \OC_User::getDisplayNames( $search, $limit, $offset );
}
/**
- * @brief Check if the user is logged in
- * @returns true/false
- *
- * Checks if the user is logged in
+ * Check if the user is logged in
+ * @return boolean
*/
public static function isLoggedIn() {
return \OC_User::isLoggedIn();
}
/**
- * @brief check if a user exists
+ * Check if a user exists
* @param string $uid the username
* @param string $excludingBackend (default none)
* @return boolean
@@ -91,7 +92,7 @@ class User {
return \OC_User::userExists( $uid, $excludingBackend );
}
/**
- * @brief Loggs the user out including all the session data
+ * Logs the user out including all the session data
* Logout, destroys session
*/
public static function logout() {
@@ -99,10 +100,10 @@ class User {
}
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns mixed username on success, false otherwise
+ * Check if the password is correct
+ * @param string The username
+ * @param string The password
+ * @return mixed username on success, false otherwise
*
* Check if the password is correct without logging in the user
*/
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 65b0ba89b80..6092d5e8dac 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -54,7 +54,11 @@ tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:h
tr:hover>td.remove>a { float:right; }
li.selected { background-color:#ddd; }
table.grid { width:100%; }
-#rightcontent { padding-left: 1em; }
+#leftcontent, .leftcontent {
+ width: 256px;
+}
+#rightcontent, .rightcontent { top: 80px; left: 336px; }
+#rightcontent { padding-left: 10px; }
div.quota {
float: right;
display: block;
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d7e26e482c9..1d02b323462 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -51,7 +51,7 @@ $TRANSLATIONS = array(
"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." => "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
"Setup Warning" => "Einrichtungswarnung",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfe die <a href=\"%s\">Instalationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfe die <a href=\"%s\">Installationsanleitungen</a>.",
"Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
"Locale not working" => "Ländereinstellung funktioniert nicht",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index ca407a730bb..a45aa8d204f 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -26,8 +26,8 @@ $TRANSLATIONS = array(
"Disable" => "Lülita välja",
"Enable" => "Lülita sisse",
"Please wait...." => "Palun oota...",
-"Error while disabling app" => "Viga rakendi keelamisel",
-"Error while enabling app" => "Viga rakendi lubamisel",
+"Error while disabling app" => "Viga rakenduse keelamisel",
+"Error while enabling app" => "Viga rakenduse lubamisel",
"Updating...." => "Uuendamine...",
"Error while updating app" => "Viga rakenduse uuendamisel",
"Error" => "Viga",
@@ -59,7 +59,7 @@ $TRANSLATIONS = array(
"Internet connection not working" => "Internetiühendus ei toimi",
"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." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
"Cron" => "Cron",
-"Execute one task with each page loaded" => "Käivita toiming lehe laadimisel",
+"Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel",
"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut üle http.",
"Use systems cron service to call the cron.php file once a minute." => "Kasuta süsteemi cron teenust käivitamaks faili cron.php kord minutis.",
"Sharing" => "Jagamine",
@@ -110,12 +110,12 @@ $TRANSLATIONS = array(
"Your email address" => "Sinu e-posti aadress",
"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
"Profile picture" => "Profiili pilt",
-"Upload new" => "Laadi uus",
+"Upload new" => "Laadi uus üles",
"Select new from Files" => "Vali failidest uus",
"Remove image" => "Eemalda pilt",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata.",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
"Abort" => "Katkesta",
-"Choose as profile image" => "Vali kui profiili pilt",
+"Choose as profile image" => "Vali profiilipildiks",
"Language" => "Keel",
"Help translate" => "Aita tõlkida",
"WebDAV" => "WebDAV",
@@ -126,7 +126,7 @@ $TRANSLATIONS = array(
"Decrypt all Files" => "Dekrüpteeri kõik failid",
"Login Name" => "Kasutajanimi",
"Create" => "Lisa",
-"Admin Recovery Password" => "Admin taasteparool",
+"Admin Recovery Password" => "Admini parooli taastamine",
"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
"Default Storage" => "Vaikimisi maht",
"Unlimited" => "Piiramatult",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index cba844e7818..9ab2076abf4 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
"Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
"Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
"Allow users to only share with users in their groups" => "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak",
+"Allow mail notification" => "E-mail értesítések engedélyezése",
+"Allow user to send mail notification for shared files" => "Engedélyezi, hogy a felhasználók e-mail értesítést küldhessenek a megosztott fájlokról.",
"Security" => "Biztonság",
"Enforce HTTPS" => "Kötelező HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
new file mode 100644
index 00000000000..256e22a23b9
--- /dev/null
+++ b/settings/l10n/ru_RU.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "Ошибка",
+"Password" => "Пароль",
+"Username" => "Имя пользователя"
+);
+$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/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index cd44e5f94c5..29c2b783e85 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Nie je možné pridať používateľa do skupiny %s",
"Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
"Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
+"Wrong password" => "Nesprávne heslo",
+"No user supplied" => "Nebol uvedený používateľ",
+"Unable to change password" => "Zmena hesla sa nepodarila",
"Update to {appversion}" => "Aktualizovať na {appversion}",
"Disable" => "Zakázať",
"Enable" => "Zapnúť",
@@ -27,6 +30,7 @@ $TRANSLATIONS = array(
"Error" => "Chyba",
"Update" => "Aktualizovať",
"Updated" => "Aktualizované",
+"Select a profile picture" => "Vybrať profilový obrázok",
"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
"Saving..." => "Ukladám...",
"deleted" => "zmazané",
@@ -66,6 +70,8 @@ $TRANSLATIONS = array(
"Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
"Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
"Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
+"Allow mail notification" => "Povoliť upozornenia emailom",
+"Allow user to send mail notification for shared files" => "Povoliť používateľom upozornenia emailom pre svoje zdieľané súbory",
"Security" => "Zabezpečenie",
"Enforce HTTPS" => "Vynútiť HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
@@ -101,6 +107,11 @@ $TRANSLATIONS = array(
"Your email address" => "Vaša emailová adresa",
"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
"Profile picture" => "Profilová fotka",
+"Upload new" => "Nahrať nový",
+"Select new from Files" => "Vyberte nový zo Súborov",
+"Remove image" => "Zmazať obrázok",
+"Abort" => "Prerušiť",
+"Choose as profile image" => "Vybrať ako profilový obrázok",
"Language" => "Jazyk",
"Help translate" => "Pomôcť s prekladom",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 4f8ad376db7..e5126150f2e 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
"Allow users to share with anyone" => "Tillåt delning med alla",
"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
+"Allow mail notification" => "Tillåt e-post notifikation",
+"Allow user to send mail notification for shared files" => "Tillåt användare att skicka e-port notifikationer för delade filer",
"Security" => "Säkerhet",
"Enforce HTTPS" => "Kräv HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1091b1dab54..a2c877340ee 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -104,7 +104,7 @@ if (!$_['internetconnectionworking']) {
print_unescaped('checked="checked"');
} ?>>
<label for="backgroundjobs_webcron">Webcron</label><br/>
- <em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em>
+ <em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over http.")); ?></em>
</p>
<p>
<input type="radio" name="mode" value="cron"
@@ -112,7 +112,7 @@ if (!$_['internetconnectionworking']) {
print_unescaped('checked="checked"');
} ?>>
<label for="backgroundjobs_cron">Cron</label><br/>
- <em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em>
+ <em><?php p($l->t("Use systems cron service to call the cron.php file every 15 minutes.")); ?></em>
</p>
</fieldset>
diff --git a/tests/data/openssl.cnf b/tests/data/openssl.cnf
new file mode 100644
index 00000000000..1eb86c40126
--- /dev/null
+++ b/tests/data/openssl.cnf
@@ -0,0 +1,350 @@
+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME = .
+RANDFILE = $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file = $ENV::HOME/.oid
+oid_section = new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions =
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
+####################################################################
+[ ca ]
+default_ca = CA_default # The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir = ./demoCA # Where everything is kept
+certs = $dir/certs # Where the issued certs are kept
+crl_dir = $dir/crl # Where the issued crl are kept
+database = $dir/index.txt # database index file.
+#unique_subject = no # Set to 'no' to allow creation of
+ # several ctificates with same subject.
+new_certs_dir = $dir/newcerts # default place for new certs.
+
+certificate = $dir/cacert.pem # The CA certificate
+serial = $dir/serial # The current serial number
+crlnumber = $dir/crlnumber # the current crl number
+ # must be commented out to leave a V1 CRL
+crl = $dir/crl.pem # The current CRL
+private_key = $dir/private/cakey.pem# The private key
+RANDFILE = $dir/private/.rand # private random number file
+
+x509_extensions = usr_cert # The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt = ca_default # Subject Name options
+cert_opt = ca_default # Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions = crl_ext
+
+default_days = 365 # how long to certify for
+default_crl_days= 30 # how long before next CRL
+default_md = default # use public key default MD
+preserve = no # keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy = policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName = match
+stateOrProvinceName = match
+organizationName = match
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName = optional
+stateOrProvinceName = optional
+localityName = optional
+organizationName = optional
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
+
+####################################################################
+[ req ]
+default_bits = 2048
+default_keyfile = privkey.pem
+distinguished_name = req_distinguished_name
+attributes = req_attributes
+x509_extensions = v3_ca # The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options.
+# default: PrintableString, T61String, BMPString.
+# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName = Country Name (2 letter code)
+countryName_default = AU
+countryName_min = 2
+countryName_max = 2
+
+stateOrProvinceName = State or Province Name (full name)
+stateOrProvinceName_default = Some-State
+
+localityName = Locality Name (eg, city)
+
+0.organizationName = Organization Name (eg, company)
+0.organizationName_default = Internet Widgits Pty Ltd
+
+# we can do this but it is not needed normally :-)
+#1.organizationName = Second Organization Name (eg, company)
+#1.organizationName_default = World Wide Web Pty Ltd
+
+organizationalUnitName = Organizational Unit Name (eg, section)
+#organizationalUnitName_default =
+
+commonName = Common Name (e.g. server FQDN or YOUR name)
+commonName_max = 64
+
+emailAddress = Email Address
+emailAddress_max = 64
+
+# SET-ex3 = SET extension number 3
+
+[ req_attributes ]
+challengePassword = A challenge password
+challengePassword_min = 4
+challengePassword_max = 20
+
+unstructuredName = An optional company name
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType = server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment = "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType = server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment = "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1 # the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir = ./demoCA # TSA root directory
+serial = $dir/tsaserial # The current serial number (mandatory)
+crypto_device = builtin # OpenSSL engine to use for signing
+signer_cert = $dir/tsacert.pem # The TSA signing certificate
+ # (optional)
+certs = $dir/cacert.pem # Certificate chain to include in reply
+ # (optional)
+signer_key = $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy = tsa_policy1 # Policy if request did not specify it
+ # (optional)
+other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional)
+digests = md5, sha1 # Acceptable message digests (mandatory)
+accuracy = secs:1, millisecs:500, microsecs:100 # (optional)
+clock_precision_digits = 0 # number of digits after dot. (optional)
+ordering = yes # Is ordering defined for timestamps?
+ # (optional, default: no)
+tsa_name = yes # Must the TSA name be included in the reply?
+ # (optional, default: no)
+ess_cert_id_chain = no # Must the ESS cert id chain be included?
+ # (optional, default: no)
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 9791e713dac..95ffb4514bf 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -16,4 +16,9 @@ $CONFIG = array (
'writable' => false,
)
),
+
);
+
+if(substr(strtolower(PHP_OS), 0, 3) == "win") {
+ $CONFIG['openssl'] = array( 'config' => OC::$SERVERROOT.'/tests/data/openssl.cnf');
+}
diff --git a/tests/win32-phpunit.php b/tests/win32-phpunit.php
deleted file mode 100644
index ac8f95efcbf..00000000000
--- a/tests/win32-phpunit.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-OC_PHPUnit_Loader::checkIncludePath();
-OC_PHPUnit_Loader::detectPHPUnitVersionId();
-
-//load PHPUnit
-switch (OC_PHPUnit_Loader::$PHPUnitVersionId) {
- case "36": {
- OC_PHPUnit_Loader::load36();
- break;
- }
- case "37": {
- OC_PHPUnit_Loader::load37();
- break;
- }
-}
-
-//load custom implementation of the PHPUnit_TextUI_ResultPrinter
-switch (OC_PHPUnit_Loader::$PHPUnitVersionId) {
- case "36":
- case "37": {
- class OC_PHPUnit_TextUI_ResultPrinter extends PHPUnit_TextUI_ResultPrinter
- {
- function __construct()
- {
- parent::__construct('php://stderr');
- }
-
- public function printResult(PHPUnit_Framework_TestResult $result)
- {
- $this->printHeader();
- $this->printFooter($result);
- }
-
- protected function writeProgress($progress)
- {
- //ignore
- }
- }
- break;
- }
-}
-
-//loading of OC_PHPUnit_TextUI_Command
-switch (OC_PHPUnit_Loader::$PHPUnitVersionId) {
- case "36":
- case "37": {
- class OC_PHPUnit_TextUI_Command extends PHPUnit_TextUI_Command
- {
-
- public static function main($exit = TRUE)
- {
- $command = new OC_PHPUnit_TextUI_Command();
- $command->run($_SERVER['argv'], $exit);
- }
-
- protected function handleArguments(array $argv)
- {
- parent::handleArguments($argv);
- $this->arguments['listeners'][] = new OC_PHPUnit_Framework_TestListener();
- $this->arguments['printer'] = new OC_PHPUnit_TextUI_ResultPrinter();
- }
-
- protected function createRunner()
- {
- $coverage_Filter = new PHP_CodeCoverage_Filter();
- $coverage_Filter->addFileToBlacklist(__FILE__);
- $runner = new PHPUnit_TextUI_TestRunner($this->arguments['loader'], $coverage_Filter);
- return $runner;
- }
- }
- break;
- }
-}
-
-class OC_PHPUnit_Loader
-{
-
- const SUCCESS_EXIT = 0;
- const FAILURE_EXIT = 1;
- const EXCEPTION_EXIT = 2;
-
- public static $PHPUnitVersionId;
-
- /**
- * @return void
- */
- public static function checkIncludePath()
- {
- //check include path
- $PHPUnitParentDirectory = self::getPHPUnitParentDirectory();
- if (is_null($PHPUnitParentDirectory)) {
- echo "Cannot find PHPUnit in include path (" . ini_get('include_path') . ")";
- exit(OC_PHPUnit_Loader::FAILURE_EXIT);
- }
- }
-
- /**
- * @return null | string
- */
- private static function getPHPUnitParentDirectory()
- {
- $pathArray = explode(PATH_SEPARATOR, ini_get('include_path'));
- foreach ($pathArray as $path)
- {
- if (file_exists($path . DIRECTORY_SEPARATOR . 'PHPUnit/')) {
- return $path;
- }
- }
- return null;
- }
-
- /**
- * @return void
- */
- public static function detectPHPUnitVersionId()
- {
- require_once 'PHPUnit/Runner/Version.php';
-
- $PHPUnitVersion = PHPUnit_Runner_Version::id();
-
- if ($PHPUnitVersion === "@package_version@") {
-
- self::$PHPUnitVersionId = "37";
- }
- else if (version_compare($PHPUnitVersion, '3.7.0') >= 0) {
-
- self::$PHPUnitVersionId = "37";
- }
- else if (version_compare($PHPUnitVersion, '3.6.0') >= 0) {
-
- self::$PHPUnitVersionId = "36";
- }
- else if (version_compare($PHPUnitVersion, '3.6.0') >= 0) {
-
- echo "unsupported PHPUnit version: $PHPUnitVersion";
- exit(OC_PHPUnit_Loader::FAILURE_EXIT);
- }
- }
-
- /**
- * @return void
- */
- public static function load37()
- {
-
- require 'PHPUnit/Autoload.php';
-
- }
-
-
- /**
- * @return void
- */
- public static function load36()
- {
- define('PHPUnit_MAIN_METHOD', 'OC_PHPUnit_TextUI_Command::main');
-
- require 'PHPUnit/Autoload.php';
-
- }
-}
-
-class OC_PHPUnit_Framework_TestListener implements PHPUnit_Framework_TestListener
-{
-
- private $isSummaryTestCountPrinted = false;
-
- public static function printEvent($eventName, $params = array())
- {
- self::printText("\n[$eventName");
- foreach ($params as $key => $value) {
- self::printText(" $key='$value'");
- }
- self::printText("]\n");
- }
-
- public static function printText($text)
- {
- file_put_contents('php://stderr', $text);
- }
-
- private static function getMessage(Exception $e)
- {
- $message = "";
- if (strlen(get_class($e)) != 0) {
- $message = $message . get_class($e);
- }
- if (strlen($message) != 0 && strlen($e->getMessage()) != 0) {
- $message = $message . " : ";
- }
- $message = $message . $e->getMessage();
- return self::escapeValue($message);
- }
-
- private static function getDetails(Exception $e)
- {
- return self::escapeValue($e->getTraceAsString());
- }
-
- public static function getValueAsString($value)
- {
- if (is_null($value)) {
- return "null";
- }
- else if (is_bool($value)) {
- return $value == true ? "true" : "false";
- }
- else if (is_array($value) || is_string($value)) {
- $valueAsString = print_r($value, true);
- if (strlen($valueAsString) > 10000) {
- return null;
- }
- return $valueAsString;
- }
- else if (is_scalar($value)){
- return print_r($value, true);
- }
- return null;
- }
-
- private static function escapeValue($text) {
- $text = str_replace("|", "||", $text);
- $text = str_replace("'", "|'", $text);
- $text = str_replace("\n", "|n", $text);
- $text = str_replace("\r", "|r", $text);
- $text = str_replace("]", "|]", $text);
- return $text;
- }
-
- public static function getFileName($className)
- {
- $reflectionClass = new ReflectionClass($className);
- $fileName = $reflectionClass->getFileName();
- return $fileName;
- }
-
- public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
- {
- self::printEvent("testFailed", array(
- "name" => $test->getName(),
- "message" => self::getMessage($e),
- "details" => self::getDetails($e)
- ));
- }
-
- public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
- {
- $params = array(
- "name" => $test->getName(),
- "message" => self::getMessage($e),
- "details" => self::getDetails($e)
- );
- if ($e instanceof PHPUnit_Framework_ExpectationFailedException) {
- $comparisonFailure = $e->getComparisonFailure();
- if ($comparisonFailure instanceof PHPUnit_Framework_ComparisonFailure) {
- $actualResult = $comparisonFailure->getActual();
- $expectedResult = $comparisonFailure->getExpected();
- $actualString = self::getValueAsString($actualResult);
- $expectedString = self::getValueAsString($expectedResult);
- if (!is_null($actualString) && !is_null($expectedString)) {
- $params['actual'] = self::escapeValue($actualString);
- $params['expected'] = self::escapeValue($expectedString);
- }
- }
- }
- self::printEvent("testFailed", $params);
- }
-
- public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
- {
- self::printEvent("testIgnored", array(
- "name" => $test->getName(),
- "message" => self::getMessage($e),
- "details" => self::getDetails($e)
- ));
- }
-
- public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
- {
- self::printEvent("testIgnored", array(
- "name" => $test->getName(),
- "message" => self::getMessage($e),
- "details" => self::getDetails($e)
- ));
- }
-
- public function startTest(PHPUnit_Framework_Test $test)
- {
- $testName = $test->getName();
- $params = array(
- "name" => $testName
- );
- if ($test instanceof PHPUnit_Framework_TestCase) {
- $className = get_class($test);
- $fileName = self::getFileName($className);
- $params['locationHint'] = "php_qn://$fileName::\\$className::$testName";
- }
- self::printEvent("testStarted", $params);
- }
-
- public function endTest(PHPUnit_Framework_Test $test, $time)
- {
- self::printEvent("testFinished", array(
- "name" => $test->getName(),
- "duration" => (int)(round($time, 2) * 1000)
- ));
- }
-
- public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
- {
- if (!$this->isSummaryTestCountPrinted) {
- $this->isSummaryTestCountPrinted = true;
- //print tests count
- self::printEvent("testCount", array(
- "count" => count($suite)
- ));
- }
-
- $suiteName = $suite->getName();
- if (empty($suiteName)) {
- return;
- }
- $params = array(
- "name" => $suiteName,
- );
- if (class_exists($suiteName, false)) {
- $fileName = self::getFileName($suiteName);
- $params['locationHint'] = "php_qn://$fileName::\\$suiteName";
- }
- self::printEvent("testSuiteStarted", $params);
- }
-
- public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
- {
- $suiteName = $suite->getName();
- if (empty($suiteName)) {
- return;
- }
- self::printEvent("testSuiteFinished",
- array(
- "name" => $suite->getName()
- ));
- }
-
-}
-
-OC_PHPUnit_TextUI_Command::main();