diff options
72 files changed, 785 insertions, 516 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index f6aa4f0c90e..a28b7b76c95 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -7,20 +7,17 @@ OCP\JSON::callCheck(); // Get data $dir = stripslashes($_POST["dir"]); -$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"]; $allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : false; -if ($allFiles === 'true') { - $allFiles = true; -} // delete all files in dir ? -if ($allFiles) { +if ($allFiles === 'true') { $files = array(); $fileList = \OC\Files\Filesystem::getDirectoryContent($dir); foreach ($fileList as $fileInfo) { $files[] = $fileInfo['name']; } } else { + $files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"]; $files = json_decode($files); } $filesWithError = ''; diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 5bd75ac6287..47a6ab2f04b 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -257,7 +257,7 @@ this.register('all', 'Delete', OC.PERMISSION_DELETE, function () { return OC.imagePath('core', 'actions/delete'); }, function (filename, context) { - context.fileList.do_delete(filename); + context.fileList.do_delete(filename, context.dir); $('.tipsy').remove(); }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 241997be2bc..55afedb2065 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -512,6 +512,8 @@ this.fileSummary.calculate(filesArray); + this._selectedFiles = {}; + this._selectionSummary.clear(); this.updateSelectionSummary(); $(window).scrollTop(0); @@ -1193,9 +1195,20 @@ return true; }; + function restore() { + input.tipsy('hide'); + tr.data('renaming',false); + form.remove(); + td.children('a.name').show(); + } + form.submit(function(event) { event.stopPropagation(); event.preventDefault(); + if (input.hasClass('error')) { + return; + } + try { var newName = input.val(); input.tipsy('hide'); @@ -1217,7 +1230,7 @@ $.ajax({ url: OC.filePath('files','ajax','rename.php'), data: { - dir : self.getCurrentDirectory(), + dir : tr.attr('data-path') || self.getCurrentDirectory(), newname: newName, file: oldname }, @@ -1265,10 +1278,7 @@ input.addClass('error'); } if (event.keyCode === 27) { - input.tipsy('hide'); - tr.data('renaming',false); - form.remove(); - td.children('a.name').show(); + restore(); } }); input.click(function(event) { diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 490594a1773..355761afa01 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -140,6 +140,7 @@ describe('OCA.Files.FileActions tests', function() { id: 18, type: 'file', name: 'testName.txt', + path: '/somepath/dir', mimetype: 'text/plain', size: '1234', etag: 'a01234c', @@ -151,6 +152,8 @@ describe('OCA.Files.FileActions tests', function() { $tr.find('.action.delete').click(); expect(deleteStub.calledOnce).toEqual(true); + expect(deleteStub.getCall(0).args[0]).toEqual('testName.txt'); + expect(deleteStub.getCall(0).args[1]).toEqual('/somepath/dir'); deleteStub.restore(); }); it('passes context to action handler', function() { diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 011e73d4b30..dea7c48e05e 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -485,7 +485,9 @@ describe('OCA.Files.FileList tests', function() { var $input, request; for (var i = 0; i < testFiles.length; i++) { - fileList.add(testFiles[i], {silent: true}); + var file = testFiles[i]; + file.path = '/some/subdir'; + fileList.add(file, {silent: true}); } // trigger rename prompt @@ -498,7 +500,7 @@ describe('OCA.Files.FileList tests', function() { expect(fakeServer.requests.length).toEqual(1); request = fakeServer.requests[0]; expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php'); - expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'}); + expect(OC.parseQueryString(request.url)).toEqual({'dir': '/some/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'}); } it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() { doRename(); @@ -595,6 +597,47 @@ describe('OCA.Files.FileList tests', function() { expect(fileList.$fileList.find('input.filename').length).toEqual(0); expect(fileList.$fileList.find('form').length).toEqual(0); }); + it('Validates the file name', function() { + var $input, $tr; + + for (var i = 0; i < testFiles.length; i++) { + fileList.add(testFiles[i], {silent: true}); + } + + // trigger rename prompt + fileList.rename('One.txt'); + $input = fileList.$fileList.find('input.filename'); + $input.val('Two.jpg'); + + // simulate key to trigger validation + $input.trigger(new $.Event('keyup', {keyCode: 97})); + + // input is still there with error + expect(fileList.$fileList.find('input.filename').length).toEqual(1); + expect(fileList.$fileList.find('input.filename').hasClass('error')).toEqual(true); + + // trigger submit does not send server request + $input.closest('form').trigger('submit'); + expect(fakeServer.requests.length).toEqual(0); + + // simulate escape key + $input.trigger(new $.Event('keyup', {keyCode: 27})); + + // element is added back with the correct name + $tr = fileList.findFileEl('One.txt'); + expect($tr.length).toEqual(1); + expect($tr.find('a .nametext').text().trim()).toEqual('One.txt'); + expect($tr.find('a.name').is(':visible')).toEqual(true); + + $tr = fileList.findFileEl('Two.jpg'); + expect($tr.length).toEqual(1); + expect($tr.find('a .nametext').text().trim()).toEqual('Two.jpg'); + expect($tr.find('a.name').is(':visible')).toEqual(true); + + // input and form are gone + expect(fileList.$fileList.find('input.filename').length).toEqual(0); + expect(fileList.$fileList.find('form').length).toEqual(0); + }); }); describe('Moving files', function() { beforeEach(function() { @@ -1368,7 +1411,8 @@ describe('OCA.Files.FileList tests', function() { "Content-Type": "application/json" }, JSON.stringify(data) - ]); + ] + ); fileList.changeDirectory('/'); fakeServer.respond(); expect($('.select-all').prop('checked')).toEqual(false); @@ -1386,6 +1430,37 @@ describe('OCA.Files.FileList tests', function() { expect(selectedFiles.length).toEqual(41); }); + describe('clearing the selection', function() { + it('clears selected files selected individually calling setFiles()', function() { + var selectedFiles; + + fileList.setFiles(generateFiles(0, 41)); + fileList.$fileList.find('tr:eq(5) input:checkbox:first').click(); + fileList.$fileList.find('tr:eq(7) input:checkbox:first').click(); + + selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name'); + expect(selectedFiles.length).toEqual(2); + + fileList.setFiles(generateFiles(0, 2)); + + selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name'); + expect(selectedFiles.length).toEqual(0); + }); + it('clears selected files selected with select all when calling setFiles()', function() { + var selectedFiles; + + fileList.setFiles(generateFiles(0, 41)); + $('.select-all').click(); + + selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name'); + expect(selectedFiles.length).toEqual(42); + + fileList.setFiles(generateFiles(0, 2)); + + selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name'); + expect(selectedFiles.length).toEqual(0); + }); + }); describe('Selection overlay', function() { it('show delete action according to directory permissions', function() { fileList.setFiles(testFiles); diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index 173e93c7afd..72f57c8665c 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -17,6 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", "Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.", "Initial encryption running... Please try again later." => "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.", +"Go directly to your %spersonal settings%s." => "Allerz directement à vos %spersonal settings%s.", "Encryption" => "Chiffrement", "Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" => "Mot de passe de la clef de récupération", diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php index 69bd3e96f3d..6f5a745c7b8 100644 --- a/apps/files_encryption/l10n/nl.php +++ b/apps/files_encryption/l10n/nl.php @@ -17,6 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:", "Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", "Initial encryption running... Please try again later." => "Initiële versleuteling bezig... Probeer het later opnieuw.", +"Go directly to your %spersonal settings%s." => "Ga direct naar uw %spersoonlijke instellingen%s.", "Encryption" => "Versleuteling", "Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):", "Recovery key password" => "Wachtwoord herstelsleulel", diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php index 433c15e193a..8bb0b3cc4f1 100644 --- a/apps/files_encryption/l10n/pt_PT.php +++ b/apps/files_encryption/l10n/pt_PT.php @@ -17,6 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:", "Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.", "Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde. ", +"Go directly to your %spersonal settings%s." => "Ir directo para %sdefinições pessoais%s.", "Encryption" => "Encriptação", "Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):", "Recovery key password" => "Chave de recuperação da conta", diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 28cd9e52f91..98986d1486f 100755 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -516,7 +516,7 @@ class Keymanager { * @param string|boolean $path * @param string $basePath */ - public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) { + protected static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) { $targetPath = ltrim($path, '/'); @@ -527,7 +527,7 @@ class Keymanager { isset($path_parts['dirname']) && !$view->file_exists($basePath . '/' . $path_parts['dirname']) ) { - $sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']); + $sub_dirs = explode('/', $basePath . '/' . $path_parts['dirname']); $dir = ''; foreach ($sub_dirs as $sub_dir) { $dir .= '/' . $sub_dir; diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index 2bd2ddc8e68..0c025443cd6 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -239,11 +239,30 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { \OC_FileProxy::$enabled = true; // cleanup - $this->view->unlink('/admin/files/folder1'); + $this->view->deleteAll('/admin/files/folder1'); // change encryption proxy to previous state \OC_FileProxy::$enabled = $proxyStatus; } + + function testKeySetPreperation() { + $basePath = '/'.Test_Encryption_Keymanager::TEST_USER.'/files'; + $path = '/folder1/subfolder/subsubfolder'; + + $this->assertFalse($this->view->is_dir($basePath . '/testKeySetPreperation')); + + $result = TestProtectedKeymanagerMethods::testKeySetPreperation($this->view, $path, $basePath); + + // return path without leading slash + $this->assertSame('folder1/subfolder/subsubfolder', $result); + + // check if directory structure was created + $this->assertTrue($this->view->is_dir($basePath . '/folder1/subfolder/subsubfolder')); + + // cleanup + $this->view->deleteAll($basePath . '/folder1'); + + } } /** @@ -257,4 +276,13 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager { public static function testGetFilenameFromShareKey($sharekey) { return self::getFilenameFromShareKey($sharekey); } + + /** + * @param \OC\Files\View $view relative to data/ + * @param string $path + * @param string $basePath + */ + public static function testKeySetPreperation($view, $path, $basePath) { + return self::keySetPreparation($view, $path, $basePath, ''); + } } diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php index eccfd70a5d3..9a7818b92d7 100644 --- a/apps/files_external/l10n/de.php +++ b/apps/files_external/l10n/de.php @@ -35,7 +35,7 @@ $TRANSLATIONS = array( "URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)", "Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)", "Share" => "Teilen", -"SMB / CIFS using OC login" => "´", +"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login", "Username as share" => "Benutzername als Freigabe", "URL" => "URL", "Secure https://" => "Sicherer HTTPS://", diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php index b752d635b10..bf67b5035ff 100644 --- a/apps/files_external/l10n/de_DE.php +++ b/apps/files_external/l10n/de_DE.php @@ -35,7 +35,7 @@ $TRANSLATIONS = array( "URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)", "Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)", "Share" => "Teilen", -"SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)", +"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login", "Username as share" => "Benutzername als Freigabe", "URL" => "URL", "Secure https://" => "Sicherer HTTPS://", diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index f028d09f1b3..5174cebb5a7 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -46,13 +46,17 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.", "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive", "Personal" => "Personnel", +"System" => "Système", "Saved" => "Sauvegarder", "<b>Note:</b> " => "<b>Attention :</b>", " and " => "et", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.", +"You don't have any external storages" => "Vous n'avez pas de support de stockage externe", "Name" => "Nom", +"Storage type" => "Type de support de stockage", +"Scope" => "Portée", "External Storage" => "Stockage externe", "Folder name" => "Nom du dossier", "Configuration" => "Configuration", diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index c532c5eaa7d..8536c65ace9 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -209,8 +209,14 @@ class DAV extends \OC\Files\Storage\Common { $ext = ''; } if ($this->file_exists($path)) { + if (!$this->isUpdatable($path)) { + return false; + } $tmpFile = $this->getCachedFile($path); } else { + if (!$this->isCreatable(dirname($path))) { + return false; + } $tmpFile = \OCP\Files::tmpFile($ext); } \OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack')); diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index a9f4ff5089b..a4a0a57c675 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -14,15 +14,8 @@ OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php'; \OCP\App::registerAdmin('files_sharing', 'settings-admin'); -$externalManager = new \OCA\Files_Sharing\External\Manager( - \OC::$server->getDatabaseConnection(), - \OC\Files\Filesystem::getMountManager(), - \OC\Files\Filesystem::getLoader(), - \OC::$server->getUserSession() -); -$externalManager->setup(); - OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); +OCP\Util::connectHook('OC_Filesystem', 'setup', '\OCA\Files_Sharing\External\Manager', 'setup'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php index d1cff09dffc..182ad2b94ce 100644 --- a/apps/files_sharing/l10n/fr.php +++ b/apps/files_sharing/l10n/fr.php @@ -1,11 +1,16 @@ <?php $TRANSLATIONS = array( +"Server to server sharing is not enabled on this server" => "Le partage de serveur à serveur n'est pas activé sur ce serveur", +"Couldn't add remote share" => "Impossible d'ajouter un partage distant", "Shared with you" => "Partagé avec vous", "Shared with others" => "Partagé avec d'autres", "Shared by link" => "Partagé par lien", "No files have been shared with you yet." => "Aucun fichier n'est partagé avec vous pour l'instant", "You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant", "You haven't shared any files by link yet." => "Vous ne partagez aucun de fichier par lien pour l'instant.", +"Add {name} from {owner}@{remote}" => "Ajouter {name} de {owner}@{remote}", +"No ownCloud installation found at {remote}" => "Aucune installation ownCloud n'a été trouvée sur {remote}", +"Invalid ownCloud url" => "URL ownCloud invalide", "Shared by {owner}" => "Partagé par {owner}", "Shared by" => "Partagé par", "This share is password-protected" => "Ce partage est protégé par un mot de passe", @@ -19,9 +24,14 @@ $TRANSLATIONS = array( "the link expired" => "le lien a expiré", "sharing is disabled" => "le partage est désactivé", "For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", +"Save to ownCloud" => "Enregistrer dans ownCloud", +"example.com/owncloud" => "example.com/owncloud", "Save" => "Sauvegarder", "Download" => "Télécharger", "Download %s" => "Télécharger %s", -"Direct link" => "Lien direct" +"Direct link" => "Lien direct", +"File Sharing" => "Partage de fichiers", +"Allow other instances to mount public links shared from this server" => "Autorise d'autres instances à monter des liens publiques partagés depuis ce serveur", +"Allow users to mount public link shares" => "Autorise les utilisateurs à monter des liens de partages publiques" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php index cb5f26b82f7..43c8f1c06d6 100644 --- a/apps/files_sharing/l10n/ja.php +++ b/apps/files_sharing/l10n/ja.php @@ -1,11 +1,16 @@ <?php $TRANSLATIONS = array( +"Server to server sharing is not enabled on this server" => "このサーバーでは、サーバー間の共有が有効ではありません", +"Couldn't add remote share" => "リモート共有を追加できませんでした", "Shared with you" => "あなたと共有", "Shared with others" => "他人と共有", "Shared by link" => "URLリンクで共有済", "No files have been shared with you yet." => "まだ共有を行なっているファイルはありません。", "You haven't shared any files yet." => "まだ共有を行なっているファイルはありません。", "You haven't shared any files by link yet." => "まだURLリンクで共有を行なっているファイルはありません。", +"Add {name} from {owner}@{remote}" => "{owner}@{remote} から {name} を追加", +"No ownCloud installation found at {remote}" => "{remote} には ownCloud がインストールされていません", +"Invalid ownCloud url" => "無効な ownCloud URL です", "Shared by {owner}" => "{owner} と共有中", "Shared by" => "共有者：", "This share is password-protected" => "この共有はパスワードで保護されています", @@ -19,9 +24,14 @@ $TRANSLATIONS = array( "the link expired" => "リンクの期限が切れています", "sharing is disabled" => "共有が無効になっています", "For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。", +"Save to ownCloud" => "ownCloud に保存", +"example.com/owncloud" => "example.com/owncloud", "Save" => "保存", "Download" => "ダウンロード", "Download %s" => "%s をダウンロード", -"Direct link" => "リンク" +"Direct link" => "リンク", +"File Sharing" => "ファイル共有", +"Allow other instances to mount public links shared from this server" => "このサーバの公開共有リンクを他のインスタンスからマウントできるようにする", +"Allow users to mount public link shares" => "ユーザが公開共有リンクをマウントできるようにする" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php index 4dde217348f..de6644cd385 100644 --- a/apps/files_sharing/l10n/nl.php +++ b/apps/files_sharing/l10n/nl.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Er zijn nog geen bestanden met u gedeeld.", "You haven't shared any files yet." => "U hebt nog geen bestanden gedeeld.", "You haven't shared any files by link yet." => "U hebt nog geen bestanden via een link gedeeld.", +"Add {name} from {owner}@{remote}" => "Toevoegen {name} van {owner}@{remote}", +"Invalid ownCloud url" => "Ongeldige ownCloud url", "Shared by {owner}" => "Gedeeld door {owner}", "Shared by" => "Gedeeld door", "This share is password-protected" => "Deze share is met een wachtwoord beveiligd", @@ -19,9 +21,12 @@ $TRANSLATIONS = array( "the link expired" => "de link is verlopen", "sharing is disabled" => "delen is uitgeschakeld", "For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.", +"Save to ownCloud" => "Bewaren in ownCloud", +"example.com/owncloud" => "example.com/owncloud", "Save" => "Bewaren", "Download" => "Downloaden", "Download %s" => "Download %s", -"Direct link" => "Directe link" +"Direct link" => "Directe link", +"File Sharing" => "Bestand delen" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index 70a0e98ebd5..4441a72fb16 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -67,7 +67,7 @@ class Manager { } } - public function setup() { + private function setupMounts() { // don't setup server-to-server shares if the file_external app is disabled // FIXME no longer needed if we use the webdav implementation from core if (\OC_App::isEnabled('files_external') === false) { @@ -88,6 +88,16 @@ class Manager { } } + public static function setup() { + $externalManager = new \OCA\Files_Sharing\External\Manager( + \OC::$server->getDatabaseConnection(), + \OC\Files\Filesystem::getMountManager(), + \OC\Files\Filesystem::getLoader(), + \OC::$server->getUserSession() + ); + $externalManager->setupMounts(); + } + protected function stripPath($path) { $prefix = '/' . $this->userSession->getUser()->getUID() . '/files'; return rtrim(substr($path, strlen($prefix)), '/'); diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index 942a1a929f7..64e0df76490 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -70,9 +70,9 @@ function revertFile(file, revision) { OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) ); } else { $('#dropdown').hide('blind', function() { + $('#dropdown').closest('tr').find('.modified:first').html(relative_modified_date(revision)); $('#dropdown').remove(); $('tr').removeClass('mouseOver'); - // TODO also update the modified time in the web ui }); } } diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index 5f4b3d5c15a..e701ed0b241 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -26,8 +26,8 @@ $TRANSLATIONS = array( "Select groups" => "Seleccionar grupos", "Select object classes" => "Selecionar classes de objetos", "Select attributes" => "Selecionar atributos", -"Connection test succeeded" => "Teste de conecção passado com sucesso.", -"Connection test failed" => "Erro no teste de conecção.", +"Connection test succeeded" => "Teste de ligação com sucesso.", +"Connection test failed" => "Erro no teste de ligação.", "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?", "Confirm Deletion" => "Confirmar a operação de apagar", "_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"), @@ -41,12 +41,14 @@ $TRANSLATIONS = array( "Save" => "Guardar", "Test Configuration" => "Testar a configuração", "Help" => "Ajuda", +"Groups meeting these criteria are available in %s:" => "Grupos que satisfazerem estes critérios estão disponíveis em %s:", "only those object classes:" => "apenas essas classes de objetos:", "only from those groups:" => "apenas desses grupos:", "Edit raw filter instead" => "Editar filtro raw em vez disso", "Raw LDAP filter" => "Filtro LDAP Raw", "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.", "groups found" => "grupos encontrados", +"Users login with this attribute:" => "Utilizadores entrar com este atributo:", "LDAP Username:" => "Nome de utilizador LDAP:", "LDAP Email Address:" => "Endereço de correio eletrónico LDAP:", "Other Attributes:" => "Outros Atributos:", @@ -83,6 +85,7 @@ $TRANSLATIONS = array( "Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.", "Case insensitive LDAP server (Windows)" => "Servidor LDAP (Windows) não é sensível a maiúsculas.", "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.", "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor", "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.", "Directory Settings" => "Definições de directorias", @@ -98,6 +101,10 @@ $TRANSLATIONS = array( "One Group Base DN per line" => "Uma base de grupo DN por linha", "Group Search Attributes" => "Atributos de pesquisa de grupo", "Group-Member association" => "Associar utilizador ao grupo.", +"Nested Groups" => "Grupos agrupados", +"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)", +"Paging chunksize" => "Bloco de paginação", +"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)", "Special Attributes" => "Atributos especiais", "Quota Field" => "Quota", "Quota Default" => "Quota padrão", diff --git a/core/css/styles.css b/core/css/styles.css index 75791378ad8..c1f42b457ed 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -622,6 +622,12 @@ label.infield { cursor: pointer; } +/* fixes for update page TODO should be fixed some time in a proper way */ +/* this is just for an error while updating the ownCloud instance */ +#body-login .updateProgress .error { + margin-top: 10px; + margin-bottom: 10px; +} /* Alternative Logins */ #alternative-logins legend { margin-bottom:10px; } diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 9044b98a2d4..b7bc5aecf1c 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "File" => "Fichier", "Folder" => "Dossier", "Image" => "Image", +"Audio" => "Audio", "Saving..." => "Enregistrement...", "seconds ago" => "il y a quelques secondes", "_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"), @@ -46,7 +47,12 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", +"Couldn't send reset email. Please contact your administrator." => "Impossible d'envoyer l’émail de réinitialisation. Veuillez contacter votre administrateur.", +"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis à votre adresse email.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.", +"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?", +"I know what I'm doing" => "Je sais ce que je fais", "Reset password" => "Réinitialiser le mot de passe", +"Password can not be changed. Please contact your administrator." => "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "Yes" => "Oui", "No" => "Non", "Choose" => "Choisir", @@ -120,6 +126,9 @@ $TRANSLATIONS = array( "Please reload the page." => "Veuillez recharger la page.", "The update was unsuccessful." => "La mise à jour a échoué.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", +"Couldn't reset password because the token is invalid" => "Impossible de réinitialiser le mot de passe car le jeton est invalide.", +"Couldn't send reset email. Please make sure your username is correct." => "Impossible d'envoyer l’émail de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.", +"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Impossible d'envoyer l'email de réinitialisation car il n'y a aucune adresse email pour cet utilisateur. Veuillez contacter votre administrateur.", "%s password reset" => "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.", @@ -128,6 +137,7 @@ $TRANSLATIONS = array( "Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant", "Reset" => "Réinitialiser", "New password" => "Nouveau mot de passe", +"New Password" => "Nouveau mot de passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X n'est pas supporté et %s ne fonctionnera pas correctement sur cette plateforme. Son utilisation est à vos risques et périls !", "For the best results, please consider using a GNU/Linux server instead." => "Pour des résultats meilleurs encore, pensez à utiliser un serveur GNU/Linux à la place.", "Personal" => "Personnel", @@ -176,6 +186,7 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.", "Server side authentication failed!" => "L'authentification côté serveur a échoué !", "Please contact your administrator." => "Veuillez contacter votre administrateur.", +"Forgot your password? Reset it!" => "Mot de passe perdu ? Réinitialisez-le !", "remember" => "se souvenir de moi", "Log in" => "Connexion", "Alternative Logins" => "Logins alternatifs", diff --git a/core/l10n/ja.php b/core/l10n/ja.php index d33031337cf..d9ef2593c5c 100644 --- a/core/l10n/ja.php +++ b/core/l10n/ja.php @@ -48,6 +48,9 @@ $TRANSLATIONS = array( "last year" => "1年前", "years ago" => "数年前", "Couldn't send reset email. Please contact your administrator." => "リセットメールを送信できませんでした。管理者に問い合わせてください。", +"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。", +"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.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?", +"I know what I'm doing" => "どういう操作をしているか理解しています", "Reset password" => "パスワードをリセット", "Password can not be changed. Please contact your administrator." => "パスワードは変更できません。管理者に問い合わせてください。", "Yes" => "はい", @@ -183,6 +186,7 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。", "Server side authentication failed!" => "サーバーサイドの認証に失敗しました！", "Please contact your administrator." => "管理者に問い合わせてください。", +"Forgot your password? Reset it!" => "パスワードを忘れましたか？リセットします！", "remember" => "パスワードを保存", "Log in" => "ログイン", "Alternative Logins" => "代替ログイン", diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index bca8097d05a..87cbdff4f39 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-14 01:54-0400\n" -"PO-Revision-Date: 2014-06-13 16:01+0000\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 19:21+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" @@ -167,7 +167,7 @@ msgstr "Teilen" #: appinfo/app.php:138 msgid "SMB / CIFS using OC login" -msgstr "´" +msgstr "SMB / CIFS mit OC-Login" #: appinfo/app.php:142 msgid "Username as share" @@ -213,7 +213,7 @@ msgstr "Persönlich" msgid "System" msgstr "System" -#: js/settings.js:318 js/settings.js:325 +#: js/settings.js:320 js/settings.js:327 msgid "Saved" msgstr "Gespeichert" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index f5c9ee6d098..a4873da91ff 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-18 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 06:20+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 16:29+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden" msgid "deleted {groupName}" msgstr "{groupName} gelöscht" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "rückgängig machen" @@ -347,31 +347,31 @@ msgstr "Gruppenadministrator" msgid "Delete" msgstr "Löschen" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "niemals" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" msgstr "{userName} gelöscht" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "Gruppe hinzufügen" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "Es muss ein gültiger Benutzername angegeben werden" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "Es muss ein gültiges Passwort angegeben werden" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" @@ -441,7 +441,7 @@ msgid "" "configure your webserver in a way that the data directory is no longer " "accessible or you move the data directory outside the webserver document " "root." -msgstr "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." +msgstr "Dein Datenverzeichnis und deine Dateien sind möglicherweise 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 ausserhalb des Wurzelverzeichnisses des Webservers." #: templates/admin.php:75 templates/admin.php:90 msgid "Setup Warning" @@ -534,7 +534,7 @@ msgid "" "installation of 3rd party apps don´t work. Accessing files from remote and " "sending of notification emails might also not work. We suggest to enable " "internet connection for this server if you want to have all features." -msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen." +msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen." #: templates/admin.php:189 msgid "Cron" @@ -612,7 +612,7 @@ msgstr "Erlaubt erneutes Teilen" #: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" -msgstr "c" +msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe" #: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" @@ -921,7 +921,7 @@ msgstr "Admin-Wiederherstellungspasswort" msgid "" "Enter the recovery password in order to recover the users files during " "password change" -msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen" +msgstr "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen" #: templates/users/part.createuser.php:32 msgid "Search Users and Groups" diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index 4ff00c7164c..45cafd5573b 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -7,13 +7,14 @@ # Mario Siegmann <mario_siegmann@web.de>, 2014 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014 # Tristan <blobbyjj@ymail.com>, 2013 +# kabum <uu.kabum@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:00+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 19:21+0000\n" +"Last-Translator: kabum <uu.kabum@gmail.com>\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" @@ -167,7 +168,7 @@ msgstr "Teilen" #: appinfo/app.php:138 msgid "SMB / CIFS using OC login" -msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)" +msgstr "SMB / CIFS mit OC-Login" #: appinfo/app.php:142 msgid "Username as share" @@ -213,7 +214,7 @@ msgstr "Persönlich" msgid "System" msgstr "System" -#: js/settings.js:318 js/settings.js:325 +#: js/settings.js:320 js/settings.js:327 msgid "Saved" msgstr "Gespeichert" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 6e269529ac4..f859997a0f3 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-18 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 06:20+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 15:44+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden" msgid "deleted {groupName}" msgstr "{groupName} gelöscht" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "rückgängig machen" @@ -347,31 +347,31 @@ msgstr "Gruppenadministrator" msgid "Delete" msgstr "Löschen" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "niemals" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" msgstr "{userName} gelöscht" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "Gruppe hinzufügen" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "Es muss ein gültiger Benutzername angegeben werden" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "Es muss ein gültiges Passwort angegeben werden" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 3d5029e06db..01f91f16010 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-15 01:54-0400\n" -"PO-Revision-Date: 2014-06-15 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 13:32+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" @@ -172,7 +172,7 @@ msgstr "Image" #: js/js.js:593 msgid "Audio" -msgstr "" +msgstr "Audio" #: js/js.js:607 msgid "Saving..." @@ -228,14 +228,14 @@ msgstr "il y a plusieurs années" #: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 msgid "Couldn't send reset email. Please contact your administrator." -msgstr "" +msgstr "Impossible d'envoyer l’émail de réinitialisation. Veuillez contacter votre administrateur." #: js/lostpassword.js:5 msgid "" "The link to reset your password has been sent to your email. If you do not " "receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator." -msgstr "" +msgstr "Le lien permettant de réinitialiser votre mot de passe vous a été transmis à votre adresse email.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local." #: js/lostpassword.js:7 msgid "" @@ -243,11 +243,11 @@ msgid "" "will be no way to get your data back after your password is reset.<br />If " "you are not sure what to do, please contact your administrator before you " "continue. <br />Do you really want to continue?" -msgstr "" +msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?" #: js/lostpassword.js:10 msgid "I know what I'm doing" -msgstr "" +msgstr "Je sais ce que je fais" #: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 msgid "Reset password" @@ -255,77 +255,77 @@ msgstr "Réinitialiser le mot de passe" #: js/lostpassword.js:16 msgid "Password can not be changed. Please contact your administrator." -msgstr "" +msgstr "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur." -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "Oui" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "Choisir" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "Erreur de chargement du modèle de message : {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} fichier en conflit" msgstr[1] "{count} fichiers en conflit" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "Un conflit de fichier" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "Nouveaux fichiers" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "Fichiers déjà existants" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "Quels fichiers désirez-vous garder ?" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié." -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "Annuler" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "Poursuivre" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(tous sélectionnés)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "({count} sélectionnés)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "Erreur de chargement du modèle de fichier existant" @@ -557,17 +557,17 @@ msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud #: lostpassword/controller/lostcontroller.php:110 msgid "Couldn't reset password because the token is invalid" -msgstr "" +msgstr "Impossible de réinitialiser le mot de passe car le jeton est invalide." #: lostpassword/controller/lostcontroller.php:136 msgid "Couldn't send reset email. Please make sure your username is correct." -msgstr "" +msgstr "Impossible d'envoyer l’émail de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct." #: lostpassword/controller/lostcontroller.php:151 msgid "" "Couldn't send reset email because there is no email address for this " "username. Please contact your administrator." -msgstr "" +msgstr "Impossible d'envoyer l'email de réinitialisation car il n'y a aucune adresse email pour cet utilisateur. Veuillez contacter votre administrateur." #: lostpassword/controller/lostcontroller.php:168 #, php-format @@ -610,7 +610,7 @@ msgstr "Nouveau mot de passe" #: lostpassword/templates/resetpassword.php:6 msgid "New Password" -msgstr "" +msgstr "Nouveau mot de passe" #: setup/controller.php:140 #, php-format @@ -838,7 +838,7 @@ msgstr "Veuillez contacter votre administrateur." #: templates/login.php:50 msgid "Forgot your password? Reset it!" -msgstr "" +msgstr "Mot de passe perdu ? Réinitialisez-le !" #: templates/login.php:55 msgid "remember" diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po index 68c87691d2c..428d027e5e3 100644 --- a/l10n/fr/files_encryption.po +++ b/l10n/fr/files_encryption.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-14 01:54-0400\n" -"PO-Revision-Date: 2014-06-14 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 13:42+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" @@ -112,7 +112,7 @@ msgstr "Chiffrement initial en cours... Veuillez re-essayer ultérieurement." #: templates/invalid_private_key.php:8 #, php-format msgid "Go directly to your %spersonal settings%s." -msgstr "" +msgstr "Allerz directement à vos %spersonal settings%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index 50760206324..092ff58bf5a 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 13:42+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" @@ -214,9 +214,9 @@ msgstr "Personnel" #: js/mountsfilelist.js:36 msgid "System" -msgstr "" +msgstr "Système" -#: js/settings.js:318 js/settings.js:325 +#: js/settings.js:320 js/settings.js:327 msgid "Saved" msgstr "Sauvegarder" @@ -251,7 +251,7 @@ msgstr "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est p #: templates/list.php:7 msgid "You don't have any external storages" -msgstr "" +msgstr "Vous n'avez pas de support de stockage externe" #: templates/list.php:16 msgid "Name" @@ -259,11 +259,11 @@ msgstr "Nom" #: templates/list.php:20 msgid "Storage type" -msgstr "" +msgstr "Type de support de stockage" #: templates/list.php:23 msgid "Scope" -msgstr "" +msgstr "Portée" #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index 15c41f601f6..74865ba4b95 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 15:02+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" @@ -25,21 +25,21 @@ msgstr "" #: ajax/external.php:20 msgid "Server to server sharing is not enabled on this server" -msgstr "" +msgstr "Le partage de serveur à serveur n'est pas activé sur ce serveur" #: ajax/external.php:50 msgid "Couldn't add remote share" -msgstr "" +msgstr "Impossible d'ajouter un partage distant" -#: appinfo/app.php:46 js/app.js:34 +#: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" msgstr "Partagé avec vous" -#: appinfo/app.php:55 js/app.js:53 +#: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" msgstr "Partagé avec d'autres" -#: appinfo/app.php:64 js/app.js:72 +#: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" msgstr "Partagé par lien" @@ -57,15 +57,15 @@ msgstr "Vous ne partagez aucun de fichier par lien pour l'instant." #: js/external.js:43 js/external.js:46 msgid "Add {name} from {owner}@{remote}" -msgstr "" +msgstr "Ajouter {name} de {owner}@{remote}" #: js/public.js:200 msgid "No ownCloud installation found at {remote}" -msgstr "" +msgstr "Aucune installation ownCloud n'a été trouvée sur {remote}" #: js/public.js:201 msgid "Invalid ownCloud url" -msgstr "" +msgstr "URL ownCloud invalide" #: js/share.js:60 msgid "Shared by {owner}" @@ -121,11 +121,11 @@ msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé c #: templates/public.php:20 msgid "Save to ownCloud" -msgstr "" +msgstr "Enregistrer dans ownCloud" #: templates/public.php:22 msgid "example.com/owncloud" -msgstr "" +msgstr "example.com/owncloud" #: templates/public.php:23 msgid "Save" @@ -146,12 +146,12 @@ msgstr "Lien direct" #: templates/settings-admin.php:3 msgid "File Sharing" -msgstr "" +msgstr "Partage de fichiers" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" -msgstr "" +msgstr "Autorise d'autres instances à monter des liens publiques partagés depuis ce serveur" #: templates/settings-admin.php:11 msgid "Allow users to mount public link shares" -msgstr "" +msgstr "Autorise les utilisateurs à monter des liens de partages publiques" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index e2a20e60fd4..0af543dd4a6 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 13:32+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" @@ -24,50 +24,50 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: base.php:678 +#: base.php:673 msgid "You are accessing the server from an untrusted domain." msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé." -#: base.php:679 +#: base.php:674 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " "example configuration is provided in config/config.sample.php." msgstr "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php." -#: private/app.php:361 +#: private/app.php:366 msgid "Help" msgstr "Aide" -#: private/app.php:374 +#: private/app.php:379 msgid "Personal" msgstr "Personnel" -#: private/app.php:385 +#: private/app.php:390 msgid "Settings" msgstr "Paramètres" -#: private/app.php:397 +#: private/app.php:402 msgid "Users" msgstr "Utilisateurs" -#: private/app.php:410 +#: private/app.php:415 msgid "Admin" msgstr "Administration" -#: private/app.php:978 +#: private/app.php:983 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Echec de la mise à niveau \"%s\"." -#: private/app.php:1135 +#: private/app.php:1140 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." -msgstr "" +msgstr "L'application \\\"%s\\\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud." -#: private/app.php:1147 +#: private/app.php:1152 msgid "No app name specified" msgstr "Aucun nom d'application spécifié" @@ -92,48 +92,48 @@ msgstr "Le dossier de l'application existe déjà" msgid "Can't create app folder. Please fix permissions. %s" msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s" -#: private/installer.php:231 +#: private/installer.php:235 msgid "No source specified when installing app" msgstr "Aucune source spécifiée pour installer l'application" -#: private/installer.php:238 +#: private/installer.php:242 msgid "No href specified when installing app from http" msgstr "Aucun href spécifié pour installer l'application par http" -#: private/installer.php:243 +#: private/installer.php:247 msgid "No path specified when installing app from local file" msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local" -#: private/installer.php:257 +#: private/installer.php:261 #, php-format msgid "Archives of type %s are not supported" msgstr "Les archives de type %s ne sont pas supportées" -#: private/installer.php:271 +#: private/installer.php:275 msgid "Failed to open archive when installing app" msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application" -#: private/installer.php:309 +#: private/installer.php:313 msgid "App does not provide an info.xml file" msgstr "L'application ne fournit pas de fichier info.xml" -#: private/installer.php:315 +#: private/installer.php:319 msgid "App can't be installed because of not allowed code in the App" msgstr "L'application ne peut être installée car elle contient du code non-autorisé" -#: private/installer.php:321 +#: private/installer.php:325 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud" -#: private/installer.php:327 +#: private/installer.php:331 msgid "" "App can't be installed because it contains the <shipped>true</shipped> tag " "which is not allowed for non shipped apps" msgstr "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées" -#: private/installer.php:340 +#: private/installer.php:344 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" @@ -251,13 +251,13 @@ msgstr "Spécifiez un nom d'utilisateur pour l'administrateur." msgid "Set an admin password." msgstr "Spécifiez un mot de passe administrateur." -#: private/setup.php:164 +#: private/setup.php:170 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut." -#: private/setup.php:165 +#: private/setup.php:171 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>." diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 8b7c8a4408c..400fddbe4c8 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 13:32+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" @@ -62,15 +62,15 @@ msgstr "Email envoyé" msgid "You need to set your user email before being able to send test emails." msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test." -#: admin/controller.php:116 templates/admin.php:350 +#: admin/controller.php:116 templates/admin.php:337 msgid "Send mode" msgstr "Mode d'envoi" -#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144 msgid "Encryption" msgstr "Chiffrement" -#: admin/controller.php:120 templates/admin.php:387 +#: admin/controller.php:120 templates/admin.php:374 msgid "Authentication method" msgstr "Méthode d'authentification" @@ -125,7 +125,7 @@ msgstr "Impossible de supprimer définitivement vos clés de chiffrement, merci #: ajax/installapp.php:18 ajax/uninstallapp.php:18 msgid "Couldn't remove app." -msgstr "" +msgstr "Impossible de supprimer l'application." #: ajax/lostpassword.php:12 msgid "Email saved" @@ -208,7 +208,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot msgid "Unable to change password" msgstr "Impossible de modifier le mot de passe" -#: js/admin.js:126 +#: js/admin.js:127 msgid "Sending..." msgstr "Envoi en cours..." @@ -226,7 +226,7 @@ msgstr "Mettre à jour vers {appversion}" #: js/apps.js:90 msgid "Uninstall App" -msgstr "" +msgstr "Désinstaller l'application" #: js/apps.js:96 js/apps.js:158 js/apps.js:191 msgid "Disable" @@ -270,15 +270,15 @@ msgstr "Mise à jour effectuée avec succès" #: js/apps.js:233 msgid "Uninstalling ...." -msgstr "" +msgstr "Désintallation..." #: js/apps.js:236 msgid "Error while uninstalling app" -msgstr "" +msgstr "Erreur lors de la désinstallation de l'application" #: js/apps.js:237 templates/apps.php:56 msgid "Uninstall" -msgstr "" +msgstr "Désinstaller" #: js/personal.js:256 msgid "Select a profile picture" @@ -318,7 +318,7 @@ msgstr "Restaurer les clés de chiffrement" #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "Impossible de supprimer {objName}" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" @@ -330,13 +330,13 @@ msgstr "Vous devez spécifier un nom de groupe valide" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "{groupName} supprimé" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "annuler" -#: js/users/users.js:37 templates/admin.php:302 +#: js/users/users.js:37 templates/admin.php:292 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10 #: templates/users/part.userlist.php:41 msgid "Groups" @@ -352,31 +352,31 @@ msgstr "Admin Groupe" msgid "Delete" msgstr "Supprimer" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "jamais" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" -msgstr "" +msgstr "{userName} supprimé" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "ajouter un groupe" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "Un nom d'utilisateur valide doit être saisi" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "Erreur lors de la création de l'utilisateur" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "Un mot de passe valide doit être saisi" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà" @@ -579,23 +579,23 @@ msgstr "Utilise le service cron du système pour appeler le fichier cron.php tou msgid "Sharing" msgstr "Partage" -#: templates/admin.php:240 +#: templates/admin.php:238 msgid "Allow apps to use the Share API" msgstr "Autoriser les applications à utiliser l'API de partage" -#: templates/admin.php:247 +#: templates/admin.php:243 msgid "Allow users to share via link" msgstr "Autoriser les utilisateurs à partager via des liens" -#: templates/admin.php:251 +#: templates/admin.php:249 msgid "Enforce password protection" msgstr "Appliquer la protection par mot de passe" -#: templates/admin.php:254 +#: templates/admin.php:252 msgid "Allow public uploads" msgstr "Autoriser les téléversements publics" -#: templates/admin.php:258 +#: templates/admin.php:256 msgid "Set default expiration date" msgstr "Spécifier la date d'expiration par défaut" @@ -611,116 +611,116 @@ msgstr "jours" msgid "Enforce expiration date" msgstr "Impose la date d'expiration" -#: templates/admin.php:276 +#: templates/admin.php:271 msgid "Allow resharing" msgstr "Autoriser le repartage" -#: templates/admin.php:283 +#: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" msgstr "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs de leurs groupes" -#: templates/admin.php:290 +#: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés" -#: templates/admin.php:297 +#: templates/admin.php:286 msgid "Exclude groups from sharing" msgstr "Exclure les groupes du partage" -#: templates/admin.php:308 +#: templates/admin.php:298 msgid "" "These groups will still be able to receive shares, but not to initiate them." msgstr "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier" -#: templates/admin.php:316 +#: templates/admin.php:303 msgid "Security" msgstr "Sécurité" -#: templates/admin.php:327 +#: templates/admin.php:314 msgid "Enforce HTTPS" msgstr "Forcer HTTPS" -#: templates/admin.php:329 +#: templates/admin.php:316 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée." -#: templates/admin.php:335 +#: templates/admin.php:322 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL." -#: templates/admin.php:345 +#: templates/admin.php:332 msgid "Email Server" msgstr "Serveur mail" -#: templates/admin.php:347 +#: templates/admin.php:334 msgid "This is used for sending out notifications." msgstr "Ceci est utilisé pour l'envoi des notifications." -#: templates/admin.php:378 +#: templates/admin.php:365 msgid "From address" msgstr "Adresse source" -#: templates/admin.php:379 +#: templates/admin.php:366 msgid "mail" msgstr "courriel" -#: templates/admin.php:400 +#: templates/admin.php:387 msgid "Authentication required" msgstr "Authentification requise" -#: templates/admin.php:404 +#: templates/admin.php:391 msgid "Server address" msgstr "Adresse du serveur" -#: templates/admin.php:408 +#: templates/admin.php:395 msgid "Port" msgstr "Port" -#: templates/admin.php:413 +#: templates/admin.php:400 msgid "Credentials" msgstr "Informations d'identification" -#: templates/admin.php:414 +#: templates/admin.php:401 msgid "SMTP Username" msgstr "Nom d'utilisateur SMTP" -#: templates/admin.php:417 +#: templates/admin.php:404 msgid "SMTP Password" msgstr "Mot de passe SMTP" -#: templates/admin.php:421 +#: templates/admin.php:408 msgid "Test email settings" msgstr "Paramètres de test d'e-mail" -#: templates/admin.php:422 +#: templates/admin.php:409 msgid "Send email" msgstr "Envoyer un e-mail" -#: templates/admin.php:427 +#: templates/admin.php:414 msgid "Log" msgstr "Log" -#: templates/admin.php:428 +#: templates/admin.php:415 msgid "Log level" msgstr "Niveau de log" -#: templates/admin.php:460 +#: templates/admin.php:447 msgid "More" msgstr "Plus" -#: templates/admin.php:461 +#: templates/admin.php:448 msgid "Less" msgstr "Moins" -#: templates/admin.php:467 templates/personal.php:196 +#: templates/admin.php:454 templates/personal.php:196 msgid "Version" msgstr "Version" -#: templates/admin.php:471 templates/personal.php:199 +#: templates/admin.php:458 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " diff --git a/l10n/ja/core.po b/l10n/ja/core.po index f44f9c25c33..e4d6a21511a 100644 --- a/l10n/ja/core.po +++ b/l10n/ja/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-16 01:54-0400\n" -"PO-Revision-Date: 2014-06-16 04:10+0000\n" -"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 10:21+0000\n" +"Last-Translator: YANO Tetsu <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" @@ -227,7 +227,7 @@ msgid "" "The link to reset your password has been sent to your email. If you do not " "receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator." -msgstr "" +msgstr "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。" #: js/lostpassword.js:7 msgid "" @@ -235,11 +235,11 @@ msgid "" "will be no way to get your data back after your password is reset.<br />If " "you are not sure what to do, please contact your administrator before you " "continue. <br />Do you really want to continue?" -msgstr "" +msgstr "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?" #: js/lostpassword.js:10 msgid "I know what I'm doing" -msgstr "" +msgstr "どういう操作をしているか理解しています" #: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 msgid "Reset password" @@ -249,74 +249,74 @@ msgstr "パスワードをリセット" msgid "Password can not be changed. Please contact your administrator." msgstr "パスワードは変更できません。管理者に問い合わせてください。" -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "はい" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "いいえ" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "選択" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "ファイル選択テンプレートの読み込みエラー: {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "OK" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "メッセージテンプレートの読み込みエラー: {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} ファイルが競合" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "1ファイルが競合" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "新しいファイル" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "既存のファイル" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "どちらのファイルを保持しますか？" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。" -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "キャンセル" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "続ける" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(すべて選択)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "({count} 選択)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "既存ファイルのテンプレートの読み込みエラー" @@ -829,7 +829,7 @@ msgstr "管理者に問い合わせてください。" #: templates/login.php:50 msgid "Forgot your password? Reset it!" -msgstr "" +msgstr "パスワードを忘れましたか？リセットします！" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po index 22ab1969d4a..82ed83a9c68 100644 --- a/l10n/ja/files_sharing.po +++ b/l10n/ja/files_sharing.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013 +# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014 # タカハシ <gomidori@live.jp>, 2014 # kuromabo <md81bird@hitaki.net>, 2014 # Mika Kobayashi, 2014 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 11:00+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,21 +24,21 @@ msgstr "" #: ajax/external.php:20 msgid "Server to server sharing is not enabled on this server" -msgstr "" +msgstr "このサーバーでは、サーバー間の共有が有効ではありません" #: ajax/external.php:50 msgid "Couldn't add remote share" -msgstr "" +msgstr "リモート共有を追加できませんでした" -#: appinfo/app.php:46 js/app.js:34 +#: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" msgstr "あなたと共有" -#: appinfo/app.php:55 js/app.js:53 +#: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" msgstr "他人と共有" -#: appinfo/app.php:64 js/app.js:72 +#: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" msgstr "URLリンクで共有済" @@ -56,15 +56,15 @@ msgstr "まだURLリンクで共有を行なっているファイルはありま #: js/external.js:43 js/external.js:46 msgid "Add {name} from {owner}@{remote}" -msgstr "" +msgstr "{owner}@{remote} から {name} を追加" #: js/public.js:200 msgid "No ownCloud installation found at {remote}" -msgstr "" +msgstr "{remote} には ownCloud がインストールされていません" #: js/public.js:201 msgid "Invalid ownCloud url" -msgstr "" +msgstr "無効な ownCloud URL です" #: js/share.js:60 msgid "Shared by {owner}" @@ -120,11 +120,11 @@ msgstr "不明な点は、こちらのリンクの提供者に確認をお願い #: templates/public.php:20 msgid "Save to ownCloud" -msgstr "" +msgstr "ownCloud に保存" #: templates/public.php:22 msgid "example.com/owncloud" -msgstr "" +msgstr "example.com/owncloud" #: templates/public.php:23 msgid "Save" @@ -145,12 +145,12 @@ msgstr "リンク" #: templates/settings-admin.php:3 msgid "File Sharing" -msgstr "" +msgstr "ファイル共有" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" -msgstr "" +msgstr "このサーバの公開共有リンクを他のインスタンスからマウントできるようにする" #: templates/settings-admin.php:11 msgid "Allow users to mount public link shares" -msgstr "" +msgstr "ユーザが公開共有リンクをマウントできるようにする" diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po index df9876dc5ee..b4ee28f9180 100644 --- a/l10n/ja/lib.po +++ b/l10n/ja/lib.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 10:31+0000\n" +"Last-Translator: YANO Tetsu <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" @@ -64,7 +64,7 @@ msgstr "\"%s\" へのアップグレードに失敗しました。" msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." -msgstr "" +msgstr "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。" #: private/app.php:1147 msgid "No app name specified" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 2fe28f281d8..003faecf271 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 10:31+0000\n" +"Last-Translator: YANO Tetsu <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" @@ -53,15 +53,15 @@ msgstr "メールを送信しました" msgid "You need to set your user email before being able to send test emails." msgstr "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。" -#: admin/controller.php:116 templates/admin.php:350 +#: admin/controller.php:116 templates/admin.php:337 msgid "Send mode" msgstr "送信モード" -#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144 msgid "Encryption" msgstr "暗号化" -#: admin/controller.php:120 templates/admin.php:387 +#: admin/controller.php:120 templates/admin.php:374 msgid "Authentication method" msgstr "認証方法" @@ -116,7 +116,7 @@ msgstr "暗号化キーを完全に削除できませんでした。owncloud.log #: ajax/installapp.php:18 ajax/uninstallapp.php:18 msgid "Couldn't remove app." -msgstr "" +msgstr "アプリが削除できませんでした。" #: ajax/lostpassword.php:12 msgid "Email saved" @@ -199,7 +199,7 @@ msgstr "バックエンドはパスワード変更をサポートしていませ msgid "Unable to change password" msgstr "パスワードを変更できません" -#: js/admin.js:126 +#: js/admin.js:127 msgid "Sending..." msgstr "送信中…" @@ -217,7 +217,7 @@ msgstr "{appversion} にアップデート" #: js/apps.js:90 msgid "Uninstall App" -msgstr "" +msgstr "アプリをアンインストール" #: js/apps.js:96 js/apps.js:158 js/apps.js:191 msgid "Disable" @@ -261,15 +261,15 @@ msgstr "アップデート済み" #: js/apps.js:233 msgid "Uninstalling ...." -msgstr "" +msgstr "アンインストール中 ...." #: js/apps.js:236 msgid "Error while uninstalling app" -msgstr "" +msgstr "アプリをアンインストール中にエラーが発生" #: js/apps.js:237 templates/apps.php:56 msgid "Uninstall" -msgstr "" +msgstr "アンインストール" #: js/personal.js:256 msgid "Select a profile picture" @@ -323,11 +323,11 @@ msgstr "有効なグループ名を指定する必要があります" msgid "deleted {groupName}" msgstr "{groupName} を削除しました" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "元に戻す" -#: js/users/users.js:37 templates/admin.php:302 +#: js/users/users.js:37 templates/admin.php:292 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10 #: templates/users/part.userlist.php:41 msgid "Groups" @@ -343,31 +343,31 @@ msgstr "グループ管理者" msgid "Delete" msgstr "削除" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "無し" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" msgstr "{userName} を削除しました" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "グループを追加" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "有効なユーザー名を指定する必要があります" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "ユーザー作成エラー" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "有効なパスワードを指定する必要があります" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します" @@ -570,23 +570,23 @@ msgstr "システムのcronサービスを利用して15分ごとにcron.phpフ msgid "Sharing" msgstr "共有" -#: templates/admin.php:240 +#: templates/admin.php:238 msgid "Allow apps to use the Share API" msgstr "アプリからの共有APIの利用を許可する" -#: templates/admin.php:247 +#: templates/admin.php:243 msgid "Allow users to share via link" msgstr "URLリンクで共有を許可する" -#: templates/admin.php:251 +#: templates/admin.php:249 msgid "Enforce password protection" msgstr "常にパスワード保護を有効にする" -#: templates/admin.php:254 +#: templates/admin.php:252 msgid "Allow public uploads" msgstr "パブリックなアップロードを許可する" -#: templates/admin.php:258 +#: templates/admin.php:256 msgid "Set default expiration date" msgstr "有効期限の既定値を設定" @@ -602,116 +602,116 @@ msgstr "日" msgid "Enforce expiration date" msgstr "有効期限を反映させる" -#: templates/admin.php:276 +#: templates/admin.php:271 msgid "Allow resharing" msgstr "再共有を許可する" -#: templates/admin.php:283 +#: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" msgstr "グループ内のユーザーでのみ共有するように制限する" -#: templates/admin.php:290 +#: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する" -#: templates/admin.php:297 +#: templates/admin.php:286 msgid "Exclude groups from sharing" msgstr "共有可能なグループから除外" -#: templates/admin.php:308 +#: templates/admin.php:298 msgid "" "These groups will still be able to receive shares, but not to initiate them." msgstr "このグループでは、フォルダ共有を開始することはできませんが、共有されたフォルダを参照することはできます。" -#: templates/admin.php:316 +#: templates/admin.php:303 msgid "Security" msgstr "セキュリティ" -#: templates/admin.php:327 +#: templates/admin.php:314 msgid "Enforce HTTPS" msgstr "常にHTTPSを使用する" -#: templates/admin.php:329 +#: templates/admin.php:316 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "クライアントから %sへの接続を常に暗号化します。" -#: templates/admin.php:335 +#: templates/admin.php:322 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。" -#: templates/admin.php:345 +#: templates/admin.php:332 msgid "Email Server" msgstr "メールサーバー" -#: templates/admin.php:347 +#: templates/admin.php:334 msgid "This is used for sending out notifications." msgstr "これは通知の送信に使われます。" -#: templates/admin.php:378 +#: templates/admin.php:365 msgid "From address" msgstr "アドレスから" -#: templates/admin.php:379 +#: templates/admin.php:366 msgid "mail" msgstr "メール" -#: templates/admin.php:400 +#: templates/admin.php:387 msgid "Authentication required" msgstr "要求される認証" -#: templates/admin.php:404 +#: templates/admin.php:391 msgid "Server address" msgstr "サーバーアドレス" -#: templates/admin.php:408 +#: templates/admin.php:395 msgid "Port" msgstr "ポート" -#: templates/admin.php:413 +#: templates/admin.php:400 msgid "Credentials" msgstr "資格情報" -#: templates/admin.php:414 +#: templates/admin.php:401 msgid "SMTP Username" msgstr "SMTP ユーザー名" -#: templates/admin.php:417 +#: templates/admin.php:404 msgid "SMTP Password" msgstr "SMTP パスワード" -#: templates/admin.php:421 +#: templates/admin.php:408 msgid "Test email settings" msgstr "メール設定をテスト" -#: templates/admin.php:422 +#: templates/admin.php:409 msgid "Send email" msgstr "メールを送信" -#: templates/admin.php:427 +#: templates/admin.php:414 msgid "Log" msgstr "ログ" -#: templates/admin.php:428 +#: templates/admin.php:415 msgid "Log level" msgstr "ログレベル" -#: templates/admin.php:460 +#: templates/admin.php:447 msgid "More" msgstr "もっと見る" -#: templates/admin.php:461 +#: templates/admin.php:448 msgid "Less" msgstr "閉じる" -#: templates/admin.php:467 templates/personal.php:196 +#: templates/admin.php:454 templates/personal.php:196 msgid "Version" msgstr "バージョン" -#: templates/admin.php:471 templates/personal.php:199 +#: templates/admin.php:458 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po index 412b3571c4a..4c6faf53768 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-14 01:54-0400\n" -"PO-Revision-Date: 2014-06-14 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 15:12+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" @@ -108,7 +108,7 @@ msgstr "Initiële versleuteling bezig... Probeer het later opnieuw." #: templates/invalid_private_key.php:8 #, php-format msgid "Go directly to your %spersonal settings%s." -msgstr "" +msgstr "Ga direct naar uw %spersoonlijke instellingen%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index d80f36a7c8e..189af16cc3e 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-23 15:02+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" @@ -27,15 +27,15 @@ msgstr "" msgid "Couldn't add remote share" msgstr "" -#: appinfo/app.php:46 js/app.js:34 +#: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" msgstr "Deelde met u" -#: appinfo/app.php:55 js/app.js:53 +#: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" msgstr "Deelde met anderen" -#: appinfo/app.php:64 js/app.js:72 +#: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" msgstr "Gedeeld via een link" @@ -53,7 +53,7 @@ msgstr "U hebt nog geen bestanden via een link gedeeld." #: js/external.js:43 js/external.js:46 msgid "Add {name} from {owner}@{remote}" -msgstr "" +msgstr "Toevoegen {name} van {owner}@{remote}" #: js/public.js:200 msgid "No ownCloud installation found at {remote}" @@ -61,7 +61,7 @@ msgstr "" #: js/public.js:201 msgid "Invalid ownCloud url" -msgstr "" +msgstr "Ongeldige ownCloud url" #: js/share.js:60 msgid "Shared by {owner}" @@ -117,11 +117,11 @@ msgstr "Voor meer informatie, neem contact op met de persoon die u deze link hee #: templates/public.php:20 msgid "Save to ownCloud" -msgstr "" +msgstr "Bewaren in ownCloud" #: templates/public.php:22 msgid "example.com/owncloud" -msgstr "" +msgstr "example.com/owncloud" #: templates/public.php:23 msgid "Save" @@ -142,7 +142,7 @@ msgstr "Directe link" #: templates/settings-admin.php:3 msgid "File Sharing" -msgstr "" +msgstr "Bestand delen" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index 40fe76fd843..0d17450806f 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-24 05:28+0000\n" +"Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,50 +20,50 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: base.php:678 +#: base.php:673 msgid "You are accessing the server from an untrusted domain." msgstr "U benadert de server vanaf een niet vertrouwd domein." -#: base.php:679 +#: base.php:674 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " "example configuration is provided in config/config.sample.php." msgstr "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php." -#: private/app.php:361 +#: private/app.php:366 msgid "Help" msgstr "Help" -#: private/app.php:374 +#: private/app.php:379 msgid "Personal" msgstr "Persoonlijk" -#: private/app.php:385 +#: private/app.php:390 msgid "Settings" msgstr "Instellingen" -#: private/app.php:397 +#: private/app.php:402 msgid "Users" msgstr "Gebruikers" -#: private/app.php:410 +#: private/app.php:415 msgid "Admin" msgstr "Beheerder" -#: private/app.php:978 +#: private/app.php:983 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "Upgrade \"%s\" mislukt." -#: private/app.php:1135 +#: private/app.php:1140 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." -msgstr "" +msgstr "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud." -#: private/app.php:1147 +#: private/app.php:1152 msgid "No app name specified" msgstr "De app naam is niet gespecificeerd." @@ -88,48 +88,48 @@ msgstr "App directory bestaat al" msgid "Can't create app folder. Please fix permissions. %s" msgstr "Kan de app map niet aanmaken, Herstel de permissies. %s" -#: private/installer.php:231 +#: private/installer.php:235 msgid "No source specified when installing app" msgstr "Geen bron opgegeven bij installatie van de app" -#: private/installer.php:238 +#: private/installer.php:242 msgid "No href specified when installing app from http" msgstr "Geen href opgegeven bij installeren van de app vanaf http" -#: private/installer.php:243 +#: private/installer.php:247 msgid "No path specified when installing app from local file" msgstr "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand" -#: private/installer.php:257 +#: private/installer.php:261 #, php-format msgid "Archives of type %s are not supported" msgstr "Archiefbestanden van type %s niet ondersteund" -#: private/installer.php:271 +#: private/installer.php:275 msgid "Failed to open archive when installing app" msgstr "Kon archiefbestand bij installatie van de app niet openen" -#: private/installer.php:309 +#: private/installer.php:313 msgid "App does not provide an info.xml file" msgstr "De app heeft geen info.xml bestand" -#: private/installer.php:315 +#: private/installer.php:319 msgid "App can't be installed because of not allowed code in the App" msgstr "De app kan niet worden geïnstalleerd wegens onjuiste code in de app" -#: private/installer.php:321 +#: private/installer.php:325 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" msgstr "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud" -#: private/installer.php:327 +#: private/installer.php:331 msgid "" "App can't be installed because it contains the <shipped>true</shipped> tag " "which is not allowed for non shipped apps" msgstr "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps" -#: private/installer.php:340 +#: private/installer.php:344 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" @@ -247,13 +247,13 @@ msgstr "Stel de gebruikersnaam van de beheerder in." msgid "Set an admin password." msgstr "Stel een beheerderswachtwoord in." -#: private/setup.php:164 +#: private/setup.php:170 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt." -#: private/setup.php:165 +#: private/setup.php:171 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed." diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index de7cd696ac5..09c072b5b29 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"PO-Revision-Date: 2014-06-24 05:38+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" @@ -51,15 +51,15 @@ msgstr "E-mail verzonden" msgid "You need to set your user email before being able to send test emails." msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen." -#: admin/controller.php:116 templates/admin.php:350 +#: admin/controller.php:116 templates/admin.php:337 msgid "Send mode" msgstr "Verstuurmodus" -#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144 msgid "Encryption" msgstr "Versleuteling" -#: admin/controller.php:120 templates/admin.php:387 +#: admin/controller.php:120 templates/admin.php:374 msgid "Authentication method" msgstr "Authenticatiemethode" @@ -114,7 +114,7 @@ msgstr "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud #: ajax/installapp.php:18 ajax/uninstallapp.php:18 msgid "Couldn't remove app." -msgstr "" +msgstr "Kon app niet verwijderen." #: ajax/lostpassword.php:12 msgid "Email saved" @@ -197,7 +197,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute msgid "Unable to change password" msgstr "Kan wachtwoord niet wijzigen" -#: js/admin.js:126 +#: js/admin.js:127 msgid "Sending..." msgstr "Versturen..." @@ -215,7 +215,7 @@ msgstr "Bijwerken naar {appversion}" #: js/apps.js:90 msgid "Uninstall App" -msgstr "" +msgstr "De-installeren app" #: js/apps.js:96 js/apps.js:158 js/apps.js:191 msgid "Disable" @@ -259,15 +259,15 @@ msgstr "Bijgewerkt" #: js/apps.js:233 msgid "Uninstalling ...." -msgstr "" +msgstr "De-installeren ..." #: js/apps.js:236 msgid "Error while uninstalling app" -msgstr "" +msgstr "Fout bij de-installeren app" #: js/apps.js:237 templates/apps.php:56 msgid "Uninstall" -msgstr "" +msgstr "De-installeren" #: js/personal.js:256 msgid "Select a profile picture" @@ -321,11 +321,11 @@ msgstr "Er moet een geldige groepsnaam worden opgegeven" msgid "deleted {groupName}" msgstr "verwijderd {groupName}" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "ongedaan maken" -#: js/users/users.js:37 templates/admin.php:302 +#: js/users/users.js:37 templates/admin.php:292 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10 #: templates/users/part.userlist.php:41 msgid "Groups" @@ -341,31 +341,31 @@ msgstr "Groep beheerder" msgid "Delete" msgstr "Verwijder" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "geen" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" msgstr "verwijderd {userName}" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "toevoegen groep" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "Er moet een geldige gebruikersnaam worden opgegeven" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "Fout bij aanmaken gebruiker" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "Er moet een geldig wachtwoord worden opgegeven" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al" @@ -568,23 +568,23 @@ msgstr "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepe msgid "Sharing" msgstr "Delen" -#: templates/admin.php:240 +#: templates/admin.php:238 msgid "Allow apps to use the Share API" msgstr "Apps toestaan de Share API te gebruiken" -#: templates/admin.php:247 +#: templates/admin.php:243 msgid "Allow users to share via link" msgstr "Sta gebruikers toe om te delen via een link" -#: templates/admin.php:251 +#: templates/admin.php:249 msgid "Enforce password protection" msgstr "Dwing wachtwoordbeveiliging af" -#: templates/admin.php:254 +#: templates/admin.php:252 msgid "Allow public uploads" msgstr "Sta publieke uploads toe" -#: templates/admin.php:258 +#: templates/admin.php:256 msgid "Set default expiration date" msgstr "Stel standaard vervaldatum in" @@ -600,116 +600,116 @@ msgstr "dagen" msgid "Enforce expiration date" msgstr "Verplicht de vervaldatum" -#: templates/admin.php:276 +#: templates/admin.php:271 msgid "Allow resharing" msgstr "Toestaan opnieuw delen" -#: templates/admin.php:283 +#: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" msgstr "Laat gebruikers alleen delen met andere gebruikers in hun groepen" -#: templates/admin.php:290 +#: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" msgstr "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden" -#: templates/admin.php:297 +#: templates/admin.php:286 msgid "Exclude groups from sharing" msgstr "Sluit groepen uit van delen" -#: templates/admin.php:308 +#: templates/admin.php:298 msgid "" "These groups will still be able to receive shares, but not to initiate them." msgstr "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten." -#: templates/admin.php:316 +#: templates/admin.php:303 msgid "Security" msgstr "Beveiliging" -#: templates/admin.php:327 +#: templates/admin.php:314 msgid "Enforce HTTPS" msgstr "Afdwingen HTTPS" -#: templates/admin.php:329 +#: templates/admin.php:316 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s" -#: templates/admin.php:335 +#: templates/admin.php:322 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen." -#: templates/admin.php:345 +#: templates/admin.php:332 msgid "Email Server" msgstr "E-mailserver" -#: templates/admin.php:347 +#: templates/admin.php:334 msgid "This is used for sending out notifications." msgstr "Dit wordt gestuurd voor het verzenden van meldingen." -#: templates/admin.php:378 +#: templates/admin.php:365 msgid "From address" msgstr "Afzenderadres" -#: templates/admin.php:379 +#: templates/admin.php:366 msgid "mail" msgstr "e-mail" -#: templates/admin.php:400 +#: templates/admin.php:387 msgid "Authentication required" msgstr "Authenticatie vereist" -#: templates/admin.php:404 +#: templates/admin.php:391 msgid "Server address" msgstr "Server adres" -#: templates/admin.php:408 +#: templates/admin.php:395 msgid "Port" msgstr "Poort" -#: templates/admin.php:413 +#: templates/admin.php:400 msgid "Credentials" msgstr "Inloggegevens" -#: templates/admin.php:414 +#: templates/admin.php:401 msgid "SMTP Username" msgstr "SMTP gebruikersnaam" -#: templates/admin.php:417 +#: templates/admin.php:404 msgid "SMTP Password" msgstr "SMTP wachtwoord" -#: templates/admin.php:421 +#: templates/admin.php:408 msgid "Test email settings" msgstr "Test e-mailinstellingen" -#: templates/admin.php:422 +#: templates/admin.php:409 msgid "Send email" msgstr "Versturen e-mail" -#: templates/admin.php:427 +#: templates/admin.php:414 msgid "Log" msgstr "Log" -#: templates/admin.php:428 +#: templates/admin.php:415 msgid "Log level" msgstr "Log niveau" -#: templates/admin.php:460 +#: templates/admin.php:447 msgid "More" msgstr "Meer" -#: templates/admin.php:461 +#: templates/admin.php:448 msgid "Less" msgstr "Minder" -#: templates/admin.php:467 templates/personal.php:196 +#: templates/admin.php:454 templates/personal.php:196 msgid "Version" msgstr "Versie" -#: templates/admin.php:471 templates/personal.php:199 +#: templates/admin.php:458 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po index 1687ea5846a..c48a54d5bc8 100644 --- a/l10n/pt_PT/files_encryption.po +++ b/l10n/pt_PT/files_encryption.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-14 01:54-0400\n" -"PO-Revision-Date: 2014-06-14 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 17:41+0000\n" +"Last-Translator: Fernando Moura <moura232@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" @@ -111,7 +111,7 @@ msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais t #: templates/invalid_private_key.php:8 #, php-format msgid "Go directly to your %spersonal settings%s." -msgstr "" +msgstr "Ir directo para %sdefinições pessoais%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index 556ea81b64e..c4ba6fda411 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -6,15 +6,16 @@ # Bruno Martins <inactive+skorzen@transifex.com>, 2013 # Carlos Moreira <crolidge@gmail.com>, 2014 # Daniel Pinto <daniel@mouxy.net>, 2013 +# Fernando Moura <moura232@gmail.com>, 2014 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014 # Andrew_Melim <nokostya.translation@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: Andrew_Melim <nokostya.translation@gmail.com>\n" +"POT-Creation-Date: 2014-06-23 01:54-0400\n" +"PO-Revision-Date: 2014-06-22 18:11+0000\n" +"Last-Translator: Fernando Moura <moura232@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" @@ -133,11 +134,11 @@ msgstr "Selecionar atributos" #: js/settings.js:848 msgid "Connection test succeeded" -msgstr "Teste de conecção passado com sucesso." +msgstr "Teste de ligação com sucesso." #: js/settings.js:855 msgid "Connection test failed" -msgstr "Erro no teste de conecção." +msgstr "Erro no teste de ligação." #: js/settings.js:864 msgid "Do you really want to delete the current Server Configuration?" @@ -200,7 +201,7 @@ msgstr "Ajuda" #: templates/part.wizard-groupfilter.php:4 #, php-format msgid "Groups meeting these criteria are available in %s:" -msgstr "" +msgstr "Grupos que satisfazerem estes critérios estão disponíveis em %s:" #: templates/part.wizard-groupfilter.php:8 #: templates/part.wizard-userfilter.php:8 @@ -236,7 +237,7 @@ msgstr "grupos encontrados" #: templates/part.wizard-loginfilter.php:4 msgid "Users login with this attribute:" -msgstr "" +msgstr "Utilizadores entrar com este atributo:" #: templates/part.wizard-loginfilter.php:8 msgid "LDAP Username:" @@ -405,7 +406,7 @@ msgstr "Desligar a validação de certificado SSL." msgid "" "Not recommended, use it for testing only! If connection only works with this" " option, import the LDAP server's SSL certificate in your %s server." -msgstr "" +msgstr "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s." #: templates/settings.php:28 msgid "Cache Time-To-Live" @@ -469,24 +470,24 @@ msgstr "Associar utilizador ao grupo." #: templates/settings.php:39 msgid "Nested Groups" -msgstr "" +msgstr "Grupos agrupados" #: templates/settings.php:39 msgid "" "When switched on, groups that contain groups are supported. (Only works if " "the group member attribute contains DNs.)" -msgstr "" +msgstr "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)" #: templates/settings.php:40 msgid "Paging chunksize" -msgstr "" +msgstr "Bloco de paginação" #: templates/settings.php:40 msgid "" "Chunksize used for paged LDAP searches that may return bulky results like " "user or group enumeration. (Setting it 0 disables paged LDAP searches in " "those situations.)" -msgstr "" +msgstr "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)" #: templates/settings.php:42 msgid "Special Attributes" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 97badb6465d..c1fa8fe7e66 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index da1e227208c..2a7162f185c 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -177,7 +177,7 @@ msgstr "" msgid "URL cannot be empty" msgstr "" -#: js/file-upload.js:559 js/filelist.js:1190 +#: js/file-upload.js:559 js/filelist.js:1192 msgid "{new_name} already exists" msgstr "" @@ -215,55 +215,55 @@ msgid "" "big." msgstr "" -#: js/filelist.js:621 js/filelist.js:1703 +#: js/filelist.js:623 js/filelist.js:1713 msgid "Pending" msgstr "" -#: js/filelist.js:1141 +#: js/filelist.js:1143 msgid "Error moving file." msgstr "" -#: js/filelist.js:1149 +#: js/filelist.js:1151 msgid "Error moving file" msgstr "" -#: js/filelist.js:1149 +#: js/filelist.js:1151 msgid "Error" msgstr "" -#: js/filelist.js:1227 +#: js/filelist.js:1240 msgid "Could not rename file" msgstr "" -#: js/filelist.js:1348 +#: js/filelist.js:1358 msgid "Error deleting file." msgstr "" -#: js/filelist.js:1451 templates/list.php:62 +#: js/filelist.js:1461 templates/list.php:62 msgid "Name" msgstr "" -#: js/filelist.js:1452 templates/list.php:73 +#: js/filelist.js:1462 templates/list.php:73 msgid "Size" msgstr "" -#: js/filelist.js:1453 templates/list.php:76 +#: js/filelist.js:1463 templates/list.php:76 msgid "Modified" msgstr "" -#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1596 js/filelist.js:1635 +#: js/filelist.js:1606 js/filelist.js:1645 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 c06c6945e81..39b08bbc1f9 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 3cfe4ee44c4..001b2ee18c5 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index eb8a01c91ea..73e58990b36 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,15 +25,15 @@ msgstr "" msgid "Couldn't add remote share" msgstr "" -#: appinfo/app.php:46 js/app.js:34 +#: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:55 js/app.js:53 +#: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:64 js/app.js:72 +#: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" msgstr "" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 0bbbabe8978..07a5c3b8281 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 6afb9a17030..92c9b2fce33 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 664585b2ee3..ae90ba902d3 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,50 +18,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: base.php:678 +#: base.php:673 msgid "You are accessing the server from an untrusted domain." msgstr "" -#: base.php:679 +#: base.php:674 msgid "" "Please contact your administrator. If you are an administrator of this " "instance, configure the \"trusted_domain\" setting in config/config.php. An " "example configuration is provided in config/config.sample.php." msgstr "" -#: private/app.php:361 +#: private/app.php:366 msgid "Help" msgstr "" -#: private/app.php:374 +#: private/app.php:379 msgid "Personal" msgstr "" -#: private/app.php:385 +#: private/app.php:390 msgid "Settings" msgstr "" -#: private/app.php:397 +#: private/app.php:402 msgid "Users" msgstr "" -#: private/app.php:410 +#: private/app.php:415 msgid "Admin" msgstr "" -#: private/app.php:978 +#: private/app.php:983 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" -#: private/app.php:1135 +#: private/app.php:1140 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." msgstr "" -#: private/app.php:1147 +#: private/app.php:1152 msgid "No app name specified" msgstr "" @@ -86,48 +86,48 @@ msgstr "" msgid "Can't create app folder. Please fix permissions. %s" msgstr "" -#: private/installer.php:231 +#: private/installer.php:235 msgid "No source specified when installing app" msgstr "" -#: private/installer.php:238 +#: private/installer.php:242 msgid "No href specified when installing app from http" msgstr "" -#: private/installer.php:243 +#: private/installer.php:247 msgid "No path specified when installing app from local file" msgstr "" -#: private/installer.php:257 +#: private/installer.php:261 #, php-format msgid "Archives of type %s are not supported" msgstr "" -#: private/installer.php:271 +#: private/installer.php:275 msgid "Failed to open archive when installing app" msgstr "" -#: private/installer.php:309 +#: private/installer.php:313 msgid "App does not provide an info.xml file" msgstr "" -#: private/installer.php:315 +#: private/installer.php:319 msgid "App can't be installed because of not allowed code in the App" msgstr "" -#: private/installer.php:321 +#: private/installer.php:325 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" msgstr "" -#: private/installer.php:327 +#: private/installer.php:331 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:340 +#: private/installer.php:344 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" @@ -245,13 +245,13 @@ msgstr "" msgid "Set an admin password." msgstr "" -#: private/setup.php:164 +#: private/setup.php:170 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: private/setup.php:165 +#: private/setup.php:171 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index 940c254016c..2a8ffe0b547 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,39 +18,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: app.php:361 +#: app.php:366 msgid "Help" msgstr "" -#: app.php:374 +#: app.php:379 msgid "Personal" msgstr "" -#: app.php:385 +#: app.php:390 msgid "Settings" msgstr "" -#: app.php:397 +#: app.php:402 msgid "Users" msgstr "" -#: app.php:410 +#: app.php:415 msgid "Admin" msgstr "" -#: app.php:978 +#: app.php:983 #, php-format msgid "Failed to upgrade \"%s\"." msgstr "" -#: app.php:1135 +#: app.php:1140 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." msgstr "" -#: app.php:1147 +#: app.php:1152 msgid "No app name specified" msgstr "" @@ -75,48 +75,48 @@ msgstr "" msgid "Can't create app folder. Please fix permissions. %s" msgstr "" -#: installer.php:231 +#: installer.php:235 msgid "No source specified when installing app" msgstr "" -#: installer.php:238 +#: installer.php:242 msgid "No href specified when installing app from http" msgstr "" -#: installer.php:243 +#: installer.php:247 msgid "No path specified when installing app from local file" msgstr "" -#: installer.php:257 +#: installer.php:261 #, php-format msgid "Archives of type %s are not supported" msgstr "" -#: installer.php:271 +#: installer.php:275 msgid "Failed to open archive when installing app" msgstr "" -#: installer.php:309 +#: installer.php:313 msgid "App does not provide an info.xml file" msgstr "" -#: installer.php:315 +#: installer.php:319 msgid "App can't be installed because of not allowed code in the App" msgstr "" -#: installer.php:321 +#: installer.php:325 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" msgstr "" -#: installer.php:327 +#: installer.php:331 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:340 +#: installer.php:344 msgid "" "App can't be installed because the version in info.xml/version is not the " "same as the version reported from the app store" @@ -227,13 +227,13 @@ msgstr "" msgid "Set an admin password." msgstr "" -#: setup.php:164 +#: setup.php:170 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." msgstr "" -#: setup.php:165 +#: setup.php:171 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index f6c46b3ee9e..3ca9395f8f3 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 1c0780fd0ec..6de0a346057 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index dc2368a92e8..cbfce751206 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-22 01:54-0400\n" +"POT-Creation-Date: 2014-06-24 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/lib/base.php b/lib/base.php index 7bde1dbeb8f..ca2e49bed64 100644 --- a/lib/base.php +++ b/lib/base.php @@ -262,15 +262,10 @@ class OC { * check if the instance needs to preform an upgrade * * @return bool + * @deprecated use \OCP\Util::needUpgrade instead */ public static function needUpgrade() { - if (OC_Config::getValue('installed', false)) { - $installedVersion = OC_Config::getValue('version', '0.0.0'); - $currentVersion = implode('.', OC_Util::getVersion()); - return version_compare($currentVersion, $installedVersion, '>'); - } else { - return false; - } + return \OCP\Util::needUpgrade(); } /** @@ -279,7 +274,7 @@ class OC { * @return bool|void */ public static function checkUpgrade($showTemplate = true) { - if (self::needUpgrade()) { + if (\OCP\Util::needUpgrade()) { if ($showTemplate && !OC_Config::getValue('maintenance', false)) { $version = OC_Util::getVersion(); $oldTheme = OC_Config::getValue('theme'); @@ -595,7 +590,7 @@ class OC { * register hooks for the cache */ public static function registerCacheHooks() { - if (OC_Config::getValue('installed', false) && !self::needUpgrade()) { //don't try to do this before we are properly setup + if (OC_Config::getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup \OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC'); // NOTE: This will be replaced to use OCP @@ -608,7 +603,7 @@ class OC { * register hooks for the cache */ public static function registerLogRotate() { - if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !self::needUpgrade()) { + if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup //use custom logfile path if defined, otherwise use default of owncloud.log in data directory \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log')); @@ -695,10 +690,9 @@ class OC { if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) { try { - if (!OC_Config::getValue('maintenance', false) && !self::needUpgrade()) { + if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { OC_App::loadApps(array('authentication')); OC_App::loadApps(array('filesystem', 'logging')); - OC_App::loadApps(); } self::checkSingleUserMode(); OC::$server->getRouter()->match(OC_Request::getRawPathInfo()); diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index d753e2cf44e..6b6865184eb 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Users" => "Utilisateurs", "Admin" => "Administration", "Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".", +"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.", "No app name specified" => "Aucun nom d'application spécifié", "Unknown filetype" => "Type de fichier inconnu", "Invalid image" => "Image invalide", diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php index 29a1ae102ec..aa779d62ce2 100644 --- a/lib/l10n/ja.php +++ b/lib/l10n/ja.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Users" => "ユーザー", "Admin" => "管理", "Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。", +"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。", "No app name specified" => "アプリ名が未指定", "Unknown filetype" => "不明なファイルタイプ", "Invalid image" => "無効な画像", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index c112d8bf34e..e643cab1162 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Users" => "Gebruikers", "Admin" => "Beheerder", "Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.", +"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.", "No app name specified" => "De app naam is niet gespecificeerd.", "Unknown filetype" => "Onbekend bestandsformaat", "Invalid image" => "Ongeldige afbeelding", diff --git a/lib/private/app.php b/lib/private/app.php index a62623905ff..01597b37e77 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -174,6 +174,7 @@ class OC_App { } $appConfig = \OC::$server->getAppConfig(); $appStatus = $appConfig->getValues(false, 'enabled'); + $user = \OC_User::getUser(); foreach ($appStatus as $app => $enabled) { if ($app === 'files') { continue; @@ -181,7 +182,6 @@ class OC_App { if ($enabled === 'yes') { $apps[] = $app; } else if ($enabled !== 'no') { - $user = \OC_User::getUser(); $groups = json_decode($enabled); if (is_array($groups)) { foreach ($groups as $group) { @@ -195,7 +195,12 @@ class OC_App { } sort($apps); array_unshift($apps, 'files'); - self::$enabledAppsCache = $apps; + // Only cache the app list, when the user is logged in. + // Otherwise we cache the list with disabled apps, although + // the apps are enabled for the user after he logged in. + if ($user) { + self::$enabledAppsCache = $apps; + } return $apps; } diff --git a/lib/private/helper.php b/lib/private/helper.php index 243baa46948..f90c38d236c 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -405,12 +405,17 @@ class OC_Helper { */ static function rmdirr($dir) { if (is_dir($dir)) { - $files = scandir($dir); - // FIXME: use flat array instead of recursion to avoid - // too many levels - foreach ($files as $file) { - if ($file !== '' && $file !== "." && $file !== "..") { - self::rmdirr("$dir/$file"); + $files = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), + RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($files as $fileInfo) { + /** @var SplFileInfo $fileInfo */ + if ($fileInfo->isDir()) { + rmdir($fileInfo->getRealPath()); + } else { + unlink($fileInfo->getRealPath()); } } rmdir($dir); diff --git a/lib/private/installer.php b/lib/private/installer.php index 466aa4a8f89..29470dbe3a6 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -143,8 +143,12 @@ class OC_Installer{ * @param array $info * @param bool $isShipped * + * This function could work like described below, but currently it disables and then + * enables the app again. This does result in an updated app. + * + * * This function installs an app. All information needed are passed in the - * associative array $data. + * associative array $info. * The following keys are required: * - source: string, can be "path" or "http" * diff --git a/lib/private/route/router.php b/lib/private/route/router.php index e7c8ad9ebdd..f3a4bc5f3e4 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -192,7 +192,9 @@ class Router implements IRouter { $this->loadRoutes($app); } else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') { \OC::$REQUESTEDAPP = $url; - \OC_App::loadApps(); + if (!\OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { + \OC_App::loadApps(); + } $this->loadRoutes('core'); } else { $this->loadRoutes(); diff --git a/lib/private/setup.php b/lib/private/setup.php index 7a08816c4b1..fdf98ab0959 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -50,6 +50,12 @@ class OC_Setup { $username = htmlspecialchars_decode($options['adminlogin']); $password = htmlspecialchars_decode($options['adminpass']); $datadir = htmlspecialchars_decode($options['directory']); + if( isset($options['trusted_domains']) + && is_array($options['trusted_domains'])) { + $trustedDomains = $options['trusted_domains']; + } else { + $trustedDomains = array(OC_Request::serverHost()); + } if (OC_Util::runningOnWindows()) { $datadir = rtrim(realpath($datadir), '\\'); @@ -65,7 +71,7 @@ class OC_Setup { OC_Config::setValue('passwordsalt', $salt); //write the config file - OC_Config::setValue('trusted_domains', array(OC_Request::serverHost())); + OC_Config::setValue('trusted_domains', $trustedDomains); OC_Config::setValue('datadirectory', $datadir); OC_Config::setValue('dbtype', $dbtype); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); diff --git a/lib/private/util.php b/lib/private/util.php index dfdddd0e3ab..94005daef61 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -329,7 +329,7 @@ class OC_Util { $errors = array(); $CONFIG_DATADIRECTORY = OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data'); - if (!\OC::needUpgrade() && OC_Config::getValue('installed', false)) { + if (!self::needUpgrade() && OC_Config::getValue('installed', false)) { // this check needs to be done every time $errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY); } @@ -1356,4 +1356,19 @@ class OC_Util { } return true; } + + /** + * Check whether the instance needs to preform an upgrade + * + * @return bool + */ + public static function needUpgrade() { + if (OC_Config::getValue('installed', false)) { + $installedVersion = OC_Config::getValue('version', '0.0.0'); + $currentVersion = implode('.', OC_Util::getVersion()); + return version_compare($currentVersion, $installedVersion, '>'); + } else { + return false; + } + } } diff --git a/lib/public/util.php b/lib/public/util.php index d1faec3997f..8f4691eeade 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -516,4 +516,13 @@ class Util { public static function isPublicLinkPasswordRequired() { return \OC_Util::isPublicLinkPasswordRequired(); } + + /** + * Checks whether the current version needs upgrade. + * + * @return bool true if upgrade is needed, false otherwise + */ + public static function needUpgrade() { + return \OC_Util::needUpgrade(); + } } diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 57b9e776854..1e6dfa77ffb 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -96,7 +96,7 @@ $TRANSLATIONS = array( "TLS" => "TLS", "Security Warning" => "Sicherheitswarnung", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.", -"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.", +"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öglicherweise 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 ausserhalb 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 prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.", @@ -113,7 +113,7 @@ $TRANSLATIONS = array( "This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.", "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.", "Internet connection not working" => "Keine Netzwerkverbindung", -"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." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.", +"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." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.", "Cron" => "Cron", "Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.", "Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.", @@ -131,7 +131,7 @@ $TRANSLATIONS = array( "days" => "Tagen", "Enforce expiration date" => "Ablaufdatum erzwingen", "Allow resharing" => "Erlaubt erneutes Teilen", -"Restrict users to only share with users in their groups" => "c", +"Restrict users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe", "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden", "Exclude groups from sharing" => "Gruppen von Freigaben ausschließen", "These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.", @@ -203,7 +203,7 @@ $TRANSLATIONS = array( "Login Name" => "Loginname", "Create" => "Anlegen", "Admin Recovery Password" => "Admin-Wiederherstellungspasswort", -"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", +"Enter the recovery password in order to recover the users files during password change" => "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", "Search Users and Groups" => "Nutzer und Gruppen suchen", "Add Group" => "Gruppe hinzufügen", "Group" => "Gruppe", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 4d8eda5c869..83ac9f4ccd6 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -21,6 +21,7 @@ $TRANSLATIONS = array( "Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau", "Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur", +"Couldn't remove app." => "Impossible de supprimer l'application.", "Email saved" => "E-mail sauvegardé", "Invalid email" => "E-mail invalide", "Unable to delete group" => "Impossible de supprimer le groupe", @@ -43,6 +44,7 @@ $TRANSLATIONS = array( "User Documentation" => "Documentation utilisateur", "Admin Documentation" => "Documentation administrateur", "Update to {appversion}" => "Mettre à jour vers {appversion}", +"Uninstall App" => "Désinstaller l'application", "Disable" => "Désactiver", "Enable" => "Activer", "Please wait...." => "Veuillez patienter…", @@ -53,6 +55,9 @@ $TRANSLATIONS = array( "Error" => "Erreur", "Update" => "Mettre à jour", "Updated" => "Mise à jour effectuée avec succès", +"Uninstalling ...." => "Désintallation...", +"Error while uninstalling app" => "Erreur lors de la désinstallation de l'application", +"Uninstall" => "Désinstaller", "Select a profile picture" => "Selectionner une photo de profil ", "Very weak password" => "Mot de passe de très faible sécurité", "Weak password" => "Mot de passe de faible sécurité", @@ -62,13 +67,16 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.", "Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement", "Restore encryption keys." => "Restaurer les clés de chiffrement", +"Unable to delete {objName}" => "Impossible de supprimer {objName}", "Error creating group" => "Erreur lors de la création du groupe", "A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide", +"deleted {groupName}" => "{groupName} supprimé", "undo" => "annuler", "Groups" => "Groupes", "Group Admin" => "Admin Groupe", "Delete" => "Supprimer", "never" => "jamais", +"deleted {userName}" => "{userName} supprimé", "add group" => "ajouter un groupe", "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi", "Error creating user" => "Erreur lors de la création de l'utilisateur", diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php index d9a8e0f56d5..7c55e4da429 100644 --- a/settings/l10n/ja.php +++ b/settings/l10n/ja.php @@ -21,6 +21,7 @@ $TRANSLATIONS = array( "Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。", "Encryption keys deleted permanently" => "暗号化キーは完全に削除されます", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。", +"Couldn't remove app." => "アプリが削除できませんでした。", "Email saved" => "メールアドレスを保存しました", "Invalid email" => "無効なメールアドレス", "Unable to delete group" => "グループを削除できません", @@ -43,6 +44,7 @@ $TRANSLATIONS = array( "User Documentation" => "ユーザードキュメント", "Admin Documentation" => "管理者ドキュメント", "Update to {appversion}" => "{appversion} にアップデート", +"Uninstall App" => "アプリをアンインストール", "Disable" => "無効", "Enable" => "有効にする", "Please wait...." => "しばらくお待ちください。", @@ -53,6 +55,9 @@ $TRANSLATIONS = array( "Error" => "エラー", "Update" => "アップデート", "Updated" => "アップデート済み", +"Uninstalling ...." => "アンインストール中 ....", +"Error while uninstalling app" => "アプリをアンインストール中にエラーが発生", +"Uninstall" => "アンインストール", "Select a profile picture" => "プロファイル画像を選択", "Very weak password" => "非常に弱いパスワード", "Weak password" => "弱いパスワード", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 506ddf4fac4..a5d3f4c45fb 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -21,6 +21,7 @@ $TRANSLATIONS = array( "Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw", "Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.", +"Couldn't remove app." => "Kon app niet verwijderen.", "Email saved" => "E-mail bewaard", "Invalid email" => "Ongeldige e-mail", "Unable to delete group" => "Niet in staat om groep te verwijderen", @@ -43,6 +44,7 @@ $TRANSLATIONS = array( "User Documentation" => "Gebruikersdocumentatie", "Admin Documentation" => "Beheerdocumentatie", "Update to {appversion}" => "Bijwerken naar {appversion}", +"Uninstall App" => "De-installeren app", "Disable" => "Uitschakelen", "Enable" => "Activeer", "Please wait...." => "Even geduld aub....", @@ -53,6 +55,9 @@ $TRANSLATIONS = array( "Error" => "Fout", "Update" => "Bijwerken", "Updated" => "Bijgewerkt", +"Uninstalling ...." => "De-installeren ...", +"Error while uninstalling app" => "Fout bij de-installeren app", +"Uninstall" => "De-installeren", "Select a profile picture" => "Kies een profielafbeelding", "Very weak password" => "Zeer zwak wachtwoord", "Weak password" => "Zwak wachtwoord", diff --git a/tests/lib/helper.php b/tests/lib/helper.php index cfd66e99704..20b8571b91d 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -454,4 +454,28 @@ class Test_Helper extends PHPUnit_Framework_TestCase { $this->assertEquals('http://localhost/owncloud/public.php?service=files', $result); } + /** + * Tests recursive folder deletion with rmdirr() + */ + public function testRecursiveFolderDeletion() { + $baseDir = \OC_Helper::tmpFolder() . '/'; + mkdir($baseDir . 'a/b/c/d/e', 0777, true); + mkdir($baseDir . 'a/b/c1/d/e', 0777, true); + mkdir($baseDir . 'a/b/c2/d/e', 0777, true); + mkdir($baseDir . 'a/b1/c1/d/e', 0777, true); + mkdir($baseDir . 'a/b2/c1/d/e', 0777, true); + mkdir($baseDir . 'a/b3/c1/d/e', 0777, true); + mkdir($baseDir . 'a1/b', 0777, true); + mkdir($baseDir . 'a1/c', 0777, true); + file_put_contents($baseDir . 'a/test.txt', 'Hello file!'); + file_put_contents($baseDir . 'a/b1/c1/test one.txt', 'Hello file one!'); + file_put_contents($baseDir . 'a1/b/test two.txt', 'Hello file two!'); + \OC_Helper::rmdirr($baseDir . 'a'); + + $this->assertFalse(file_exists($baseDir . 'a')); + $this->assertTrue(file_exists($baseDir . 'a1')); + + \OC_Helper::rmdirr($baseDir); + $this->assertFalse(file_exists($baseDir)); + } } |