wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix-20151

Browse source
This commit is contained in:
blizzz 2015-11-02 13:32:24 +01:00
commit 83d3c94590
62 changed files with 248 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/encryption/l10n/cs_CZ.js
View file

@ -28,8 +28,12 @@ OC.L10N.register(
"one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
"Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ahoj!\n\nAdministrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla '%s'.\n\nPřihlašte se do webového rozhraní, přejděte do nastavení 'základního šifrovacího modulu ownCloud' a aktualizujte šifrovací heslo zadáním hesla výše do pole 'původní přihlašovací heslo' a svého aktuálního přihlašovacího hesla.\n\n",
"The share will expire on %s." : "Sdílení vyprší %s.",
"Cheers!" : "Ať slouží!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení \"základního šifrovacího modulu ownCloud\" a aktualizujte šifrovací heslo zadáním hesla výše do pole \"původní přihlašovací heslo\" a svého aktuálního přihlašovacího hesla.<br><br>",
"Encrypt the home storage" : "Zašifrovat domovské úložiště",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
@ -40,7 +44,7 @@ OC.L10N.register(
"New recovery key password" : "Nové heslo záchranného klíče",
"Repeat new recovery key password" : "Zopakujte nové heslo záchranného klíče",
"Change Password" : "Změnit heslo",
"ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
"ownCloud basic encryption module" : "základní šifrovací modul ownCloud",
"Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",

6
apps/encryption/l10n/cs_CZ.json
View file

@ -26,8 +26,12 @@
"one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
"Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ahoj!\n\nAdministrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla '%s'.\n\nPřihlašte se do webového rozhraní, přejděte do nastavení 'základního šifrovacího modulu ownCloud' a aktualizujte šifrovací heslo zadáním hesla výše do pole 'původní přihlašovací heslo' a svého aktuálního přihlašovacího hesla.\n\n",
"The share will expire on %s." : "Sdílení vyprší %s.",
"Cheers!" : "Ať slouží!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ahoj!<br><br>Administrátor povolil šifrování dat na serveru. Vaše soubory byly zašifrovány za použití hesla <strong>%s<strong>.<br><br>Přihlašte se do webového rozhraní, přejděte do nastavení \"základního šifrovacího modulu ownCloud\" a aktualizujte šifrovací heslo zadáním hesla výše do pole \"původní přihlašovací heslo\" a svého aktuálního přihlašovacího hesla.<br><br>",
"Encrypt the home storage" : "Zašifrovat domovské úložiště",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Povolení tohoto nastavení zašifruje všechny soubory uložené v hlavním úložišti, jinak budou šifrovány pouze soubory na externích úložištích.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
@ -38,7 +42,7 @@
"New recovery key password" : "Nové heslo záchranného klíče",
"Repeat new recovery key password" : "Zopakujte nové heslo záchranného klíče",
"Change Password" : "Změnit heslo",
"ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
"ownCloud basic encryption module" : "základní šifrovací modul ownCloud",
"Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",

2
apps/encryption/l10n/ja.js
View file

@ -32,6 +32,8 @@ OC.L10N.register(
"The share will expire on %s." : "共有は %s で有効期限が切れます。",
"Cheers!" : "それでは！",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"ownCloud 基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
"Encrypt the home storage" : "メインストレージ暗号化",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイル全てが暗号化されます。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",

2
apps/encryption/l10n/ja.json
View file

@ -30,6 +30,8 @@
"The share will expire on %s." : "共有は %s で有効期限が切れます。",
"Cheers!" : "それでは！",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "こんにちは、<br><br>管理者がサーバーサイド暗号化を有効にしました。<strong>%s</strong>というパスワードであなたのファイルが暗号化されました。<br><br>Web画面からログインして、個人設定画面の\"ownCloud 基本暗号化モジュール\"のセクションにいき、暗号化パスワードの更新をお願いします。 \"旧ログインパスワード”部分に上記パスワードを入力し、現在のログインパスワードで更新します。<br><br>",
"Encrypt the home storage" : "メインストレージ暗号化",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "このオプションを有効にすると、外部ストレージ接続ストレージだけが暗号化されるのではなく、メインストレージのファイル全てが暗号化されます。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",

2
apps/encryption/l10n/nl.js
View file

@ -32,6 +32,8 @@ OC.L10N.register(
"The share will expire on %s." : "De share vervalt op %s.",
"Cheers!" : "Proficiat!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op do hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",

2
apps/encryption/l10n/nl.json
View file

@ -30,6 +30,8 @@
"The share will expire on %s." : "De share vervalt op %s.",
"Cheers!" : "Proficiat!",
"Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
"Encrypt the home storage" : "Versleutel de eigen serveropslag",
"Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Het inschakelen van deze optie zorgt voor versleutelen van alle bestanden op do hoofdopslag, anders worden alleen bestanden op externe opslag versleuteld",
"Enable recovery key" : "Activeer herstelsleutel",
"Disable recovery key" : "Deactiveer herstelsleutel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",

2
apps/files/js/fileactions.js
View file

@ -589,7 +589,7 @@
context.fileList.showFileBusyState(filename, false);
};
context.fileList.showFileBusyState(downloadFileaction, true);
context.fileList.showFileBusyState(filename, true);
OCA.Files.Files.handleDownload(url, disableLoadingState);
}
}

7
apps/files/js/files.js
View file

@ -295,7 +295,12 @@
}
};
OC.redirect(url + '&downloadStartSecret=' + randomToken);
if (url.indexOf('?') >= 0) {
url += '&';
} else {
url += '?';
}
OC.redirect(url + 'downloadStartSecret=' + randomToken);
OC.Util.waitFor(checkForDownloadCookie, 500);
}
};

6
apps/files/l10n/zh_TW.js
View file

@ -28,7 +28,7 @@ OC.L10N.register(
"Files" : "檔案",
"All files" : "所有檔案",
"Favorites" : "最愛",
"Home" : "住宅",
"Home" : "家目錄",
"Close" : " 關閉",
"Upload cancelled." : "上傳已取消",
"Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
@ -75,12 +75,12 @@ OC.L10N.register(
"_%n byte_::_%n bytes_" : ["%n 位元組"],
"Favorited" : "已加入最愛",
"Favorite" : "我的最愛",
"{newname} already exists" : "{newname} 已經存在",
"Upload" : "上傳",
"Text file" : "文字檔",
"New text file.txt" : "新文字檔.txt",
"Folder" : "資料夾",
"New folder" : "新資料夾",
"{newname} already exists" : "{newname} 已經存在",
"Upload" : "上傳",
"An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
"A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
"A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",

6
apps/files/l10n/zh_TW.json
View file

@ -26,7 +26,7 @@
"Files" : "檔案",
"All files" : "所有檔案",
"Favorites" : "最愛",
"Home" : "住宅",
"Home" : "家目錄",
"Close" : " 關閉",
"Upload cancelled." : "上傳已取消",
"Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
@ -73,12 +73,12 @@
"_%n byte_::_%n bytes_" : ["%n 位元組"],
"Favorited" : "已加入最愛",
"Favorite" : "我的最愛",
"{newname} already exists" : "{newname} 已經存在",
"Upload" : "上傳",
"Text file" : "文字檔",
"New text file.txt" : "新文字檔.txt",
"Folder" : "資料夾",
"New folder" : "新資料夾",
"{newname} already exists" : "{newname} 已經存在",
"Upload" : "上傳",
"An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
"A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
"A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",

43
apps/files/tests/js/fileactionsSpec.js
View file

@ -227,7 +227,7 @@ describe('OCA.Files.FileActions tests', function() {
name: 'Test',
type: OCA.Files.FileActions.TYPE_INLINE,
mime: 'all',
icon: OC.imagePath('core', 'actions/test'),
icon: OC.imagePath('core', 'actions/test'),
permissions: OC.PERMISSION_READ,
actionHandler: actionStub
});
@ -556,4 +556,45 @@ describe('OCA.Files.FileActions tests', function() {
expect(handler.notCalled).toEqual(true);
});
});
describe('default actions', function() {
describe('download', function() {
it('redirects to URL and sets busy state to list', function() {
var handleDownloadStub = sinon.stub(OCA.Files.Files, 'handleDownload');
var busyStub = sinon.stub(fileList, 'showFileBusyState');
var fileData = {
id: 18,
type: 'file',
name: 'testName.txt',
mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456',
permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE
};
// note: FileActions.display() is called implicitly
fileList.add(fileData);
var model = fileList.getModelForFile('testName.txt');
fileActions.registerDefaultActions();
fileActions.triggerAction('Download', model, fileList);
expect(busyStub.calledOnce).toEqual(true);
expect(busyStub.calledWith('testName.txt', true)).toEqual(true);
expect(handleDownloadStub.calledOnce).toEqual(true);
expect(handleDownloadStub.getCall(0).args[0]).toEqual(
OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt'
);
busyStub.reset();
handleDownloadStub.yield();
expect(busyStub.calledOnce).toEqual(true);
expect(busyStub.calledWith('testName.txt', false)).toEqual(true);
busyStub.restore();
handleDownloadStub.restore();
});
});
});
});

52
apps/files/tests/js/filesSpec.js
View file

@ -87,4 +87,56 @@ describe('OCA.Files.Files tests', function() {
expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22test%20file.txt%22%2C%22abc.txt%22%5D');
});
});
describe('handleDownload', function() {
var redirectStub;
var cookieStub;
var clock;
var testUrl;
beforeEach(function() {
testUrl = 'http://example.com/owncloud/path/download.php';
redirectStub = sinon.stub(OC, 'redirect');
cookieStub = sinon.stub(OC.Util, 'isCookieSetToValue');
clock = sinon.useFakeTimers();
});
afterEach(function() {
redirectStub.restore();
cookieStub.restore();
clock.restore();
});
it('appends secret to url when no existing parameters', function() {
Files.handleDownload(testUrl);
expect(redirectStub.calledOnce).toEqual(true);
expect(redirectStub.getCall(0).args[0]).toContain(testUrl + '?downloadStartSecret=');
});
it('appends secret to url with existing parameters', function() {
Files.handleDownload(testUrl + '?test=1');
expect(redirectStub.calledOnce).toEqual(true);
expect(redirectStub.getCall(0).args[0]).toContain(testUrl + '?test=1&downloadStartSecret=');
});
it('sets cookie and calls callback when cookie appears', function() {
var callbackStub = sinon.stub();
var token;
Files.handleDownload(testUrl, callbackStub);
expect(redirectStub.calledOnce).toEqual(true);
token = OC.parseQueryString(redirectStub.getCall(0).args[0]).downloadStartSecret;
expect(token).toBeDefined();
expect(cookieStub.calledOnce).toEqual(true);
cookieStub.returns(false);
clock.tick(600);
expect(cookieStub.calledTwice).toEqual(true);
expect(cookieStub.getCall(1).args[0]).toEqual('ocDownloadStarted');
expect(cookieStub.getCall(1).args[1]).toEqual(token);
expect(callbackStub.notCalled).toEqual(true);
cookieStub.returns(true);
clock.tick(2000);
expect(cookieStub.callCount).toEqual(3);
expect(callbackStub.calledOnce).toEqual(true);
});
});
});

1
apps/files_external/l10n/cs_CZ.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Nebylo povoleno použití ověřovacího mechanismu \"%s\"",
"Unsatisfied backend parameters" : "Neuspokojivé parametry služby",
"Unsatisfied authentication mechanism parameters" : "Neuspokojivé parametry ověřovacího mechanismu",
"Insufficient data: %s" : "Nedostatečná data: %s",
"Personal" : "Osobní",
"System" : "Systém",
"Grant access" : "Povolit přístup",

1
apps/files_external/l10n/cs_CZ.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "Nebylo povoleno použití ověřovacího mechanismu \"%s\"",
"Unsatisfied backend parameters" : "Neuspokojivé parametry služby",
"Unsatisfied authentication mechanism parameters" : "Neuspokojivé parametry ověřovacího mechanismu",
"Insufficient data: %s" : "Nedostatečná data: %s",
"Personal" : "Osobní",
"System" : "Systém",
"Grant access" : "Povolit přístup",

1
apps/files_external/l10n/fr.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
"Unsatisfied backend parameters" : "Paramètres manquants pour le service",
"Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
"Insufficient data: %s" : "Données insuffisantes : %s",
"Personal" : "Personnel",
"System" : "Système",
"Grant access" : "Autoriser l'accès",

1
apps/files_external/l10n/fr.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
"Unsatisfied backend parameters" : "Paramètres manquants pour le service",
"Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
"Insufficient data: %s" : "Données insuffisantes : %s",
"Personal" : "Personnel",
"System" : "Système",
"Grant access" : "Autoriser l'accès",

1
apps/files_external/l10n/it.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
"Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
"Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
"Insufficient data: %s" : "Dati insufficienti: %s",
"Personal" : "Personale",
"System" : "Sistema",
"Grant access" : "Concedi l'accesso",

1
apps/files_external/l10n/it.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
"Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
"Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
"Insufficient data: %s" : "Dati insufficienti: %s",
"Personal" : "Personale",
"System" : "Sistema",
"Grant access" : "Concedi l'accesso",

14
apps/files_external/l10n/ja.js
View file

@ -1,19 +1,28 @@
OC.L10N.register(
"files_external",
{
"Fetching request tokens failed. Verify that your app key and secret are correct." : "リクエストトークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
"Fetching access tokens failed. Verify that your app key and secret are correct." : "アクセストークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
"Please provide a valid app key and secret." : "有効なアプリのキーとパスワードを入力してください。",
"Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
"Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
"External storage" : "外部ストレージ",
"Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
"Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
"Invalid mount point" : "無効なマウントポイント",
"Objectstore forbidden" : "オブジェクトストアが禁じられています",
"Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
"Not permitted to use backend \"%s\"" : "バックエンド %s を使うための権限がありません",
"Not permitted to use authentication mechanism \"%s\"" : "認証システム %s を使う権限がありません",
"Unsatisfied backend parameters" : "バックエンドのためのパラメーターが不十分です。",
"Unsatisfied authentication mechanism parameters" : "認証のためのパラメータが不十分です",
"Insufficient data: %s" : "データが不足しています: %s",
"Personal" : "個人",
"System" : "システム",
"Grant access" : "アクセスを許可",
"Access granted" : "アクセスは許可されました",
"Error configuring OAuth1" : "OAuth1 設定エラー",
"Error configuring OAuth2" : "OAuth2 設定エラー",
"Generate keys" : "キーを生成",
"Error generating key pair" : "キーペアの生成エラー",
"Enable encryption" : "暗号化を有効に",
@ -27,6 +36,7 @@ OC.L10N.register(
"Saved" : "保存されました",
"Access key" : "アクセスキー",
"Secret key" : "シークレットキー",
"Builtin" : "ビルトイン",
"None" : "なし",
"OAuth1" : "OAuth1",
"App key" : "アプリキー",
@ -37,9 +47,12 @@ OC.L10N.register(
"OpenStack" : "OpenStack",
"Username" : "ユーザー名",
"Password" : "パスワード",
"Tenant name" : "テナント名",
"Identity endpoint URL" : "認証エンドポイントURL",
"Rackspace" : "Rackspace",
"API key" : "APIキー",
"Username and password" : "ユーザー名とパスワード",
"Session credentials" : "セッション資格情報",
"RSA public key" : "RSA公開鍵",
"Public key" : "公開鍵",
"Amazon S3" : "Amazon S3",
@ -89,6 +102,7 @@ OC.L10N.register(
"Advanced settings" : "詳細設定",
"Delete" : "削除",
"Add storage" : "ストレージを追加",
"Allow users to mount external storages" : "ユーザーに外部ストレージのマウントを許可する",
"Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
},
"nplurals=1; plural=0;");

14
apps/files_external/l10n/ja.json
View file

@ -1,17 +1,26 @@
{ "translations": {
"Fetching request tokens failed. Verify that your app key and secret are correct." : "リクエストトークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
"Fetching access tokens failed. Verify that your app key and secret are correct." : "アクセストークンの取得に失敗しました。アプリのキーとパスワードが正しいことを確認してください。",
"Please provide a valid app key and secret." : "有効なアプリのキーとパスワードを入力してください。",
"Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
"Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
"External storage" : "外部ストレージ",
"Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
"Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
"Invalid mount point" : "無効なマウントポイント",
"Objectstore forbidden" : "オブジェクトストアが禁じられています",
"Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
"Not permitted to use backend \"%s\"" : "バックエンド %s を使うための権限がありません",
"Not permitted to use authentication mechanism \"%s\"" : "認証システム %s を使う権限がありません",
"Unsatisfied backend parameters" : "バックエンドのためのパラメーターが不十分です。",
"Unsatisfied authentication mechanism parameters" : "認証のためのパラメータが不十分です",
"Insufficient data: %s" : "データが不足しています: %s",
"Personal" : "個人",
"System" : "システム",
"Grant access" : "アクセスを許可",
"Access granted" : "アクセスは許可されました",
"Error configuring OAuth1" : "OAuth1 設定エラー",
"Error configuring OAuth2" : "OAuth2 設定エラー",
"Generate keys" : "キーを生成",
"Error generating key pair" : "キーペアの生成エラー",
"Enable encryption" : "暗号化を有効に",
@ -25,6 +34,7 @@
"Saved" : "保存されました",
"Access key" : "アクセスキー",
"Secret key" : "シークレットキー",
"Builtin" : "ビルトイン",
"None" : "なし",
"OAuth1" : "OAuth1",
"App key" : "アプリキー",
@ -35,9 +45,12 @@
"OpenStack" : "OpenStack",
"Username" : "ユーザー名",
"Password" : "パスワード",
"Tenant name" : "テナント名",
"Identity endpoint URL" : "認証エンドポイントURL",
"Rackspace" : "Rackspace",
"API key" : "APIキー",
"Username and password" : "ユーザー名とパスワード",
"Session credentials" : "セッション資格情報",
"RSA public key" : "RSA公開鍵",
"Public key" : "公開鍵",
"Amazon S3" : "Amazon S3",
@ -87,6 +100,7 @@
"Advanced settings" : "詳細設定",
"Delete" : "削除",
"Add storage" : "ストレージを追加",
"Allow users to mount external storages" : "ユーザーに外部ストレージのマウントを許可する",
"Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
},"pluralForm" :"nplurals=1; plural=0;"
}

1
apps/files_external/l10n/nl.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
"Unsatisfied backend parameters" : "Onvoldoende backend parameters",
"Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
"Insufficient data: %s" : "Onvoldoende gegevens: %s",
"Personal" : "Persoonlijk",
"System" : "Systeem",
"Grant access" : "Sta toegang toe",

1
apps/files_external/l10n/nl.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
"Unsatisfied backend parameters" : "Onvoldoende backend parameters",
"Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
"Insufficient data: %s" : "Onvoldoende gegevens: %s",
"Personal" : "Persoonlijk",
"System" : "Systeem",
"Grant access" : "Sta toegang toe",

1
apps/files_external/l10n/pt_BR.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
"Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
"Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
"Insufficient data: %s" : "Dados insuficientes: %s",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Permitir acesso",

1
apps/files_external/l10n/pt_BR.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
"Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
"Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
"Insufficient data: %s" : "Dados insuficientes: %s",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Permitir acesso",

1
apps/files_external/l10n/pt_PT.js
View file

@ -14,6 +14,7 @@ OC.L10N.register(
"Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"",
"Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"",
"Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
"Insufficient data: %s" : "Dados insuficientes: %s",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Conceder acesso",

1
apps/files_external/l10n/pt_PT.json
View file

@ -12,6 +12,7 @@
"Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"",
"Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"",
"Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
"Insufficient data: %s" : "Dados insuficientes: %s",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Conceder acesso",

1
apps/files_external/l10n/sq.js
View file

@ -16,6 +16,7 @@ OC.L10N.register(
"Not permitted to use authentication mechanism \"%s\"" : "S’i lejohet të përdorë mekanizmin e mirëfilltësimit \"%s\"",
"Unsatisfied backend parameters" : "Parametra mekanizmi shërbimi të paplotësuar",
"Unsatisfied authentication mechanism parameters" : "Parametra mekanizmi mirëfilltësimi të papërmbushur",
"Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s",
"Personal" : "Personale",
"System" : "Sistem",
"Grant access" : "Akordoji hyrje",

1
apps/files_external/l10n/sq.json
View file

@ -14,6 +14,7 @@
"Not permitted to use authentication mechanism \"%s\"" : "S’i lejohet të përdorë mekanizmin e mirëfilltësimit \"%s\"",
"Unsatisfied backend parameters" : "Parametra mekanizmi shërbimi të paplotësuar",
"Unsatisfied authentication mechanism parameters" : "Parametra mekanizmi mirëfilltësimi të papërmbushur",
"Insufficient data: %s" : "Të dhëna të pamjaftueshme: %s",
"Personal" : "Personale",
"System" : "Sistem",
"Grant access" : "Akordoji hyrje",

1
apps/files_sharing/l10n/pt_PT.js
View file

@ -52,6 +52,7 @@ OC.L10N.register(
"Shared by %2$s" : "Partilhado por %2$s",
"Shared via public link" : "Partilhado via hiperligação pública",
"Shares" : "Partilhas",
"You received %2$s as a remote share from %1$s" : "Recebeu %2$s como uma partilha remota de %1$s",
"Accept" : "Aceitar",
"Decline" : "Recusar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",

1
apps/files_sharing/l10n/pt_PT.json
View file

@ -50,6 +50,7 @@
"Shared by %2$s" : "Partilhado por %2$s",
"Shared via public link" : "Partilhado via hiperligação pública",
"Shares" : "Partilhas",
"You received %2$s as a remote share from %1$s" : "Recebeu %2$s como uma partilha remota de %1$s",
"Accept" : "Aceitar",
"Decline" : "Recusar",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",

4
apps/files_trashbin/js/app.js
View file

@ -23,11 +23,13 @@ OCA.Trashbin.App = {
return;
}
this._initialized = true;
var urlParams = OC.Util.History.parseUrlQuery();
this.fileList = new OCA.Trashbin.FileList(
$('#app-content-trashbin'), {
scrollContainer: $('#app-content'),
fileActions: this._createFileActions(),
detailsViewEnabled: false
detailsViewEnabled: false,
scrollTo: urlParams.scrollto
}
);
},

1
apps/user_ldap/js/wizard/view.js
View file

@ -352,6 +352,7 @@ OCA = OCA || {};
$('.ldap_submit').button();
$('.ldap_action_test_connection').button();
$('#ldapSettings').tabs({ beforeActivate: this.onTabChange });
$('#ldapSettings :input').tooltip({placement: "right", container: "body", trigger: "hover"});
this.initControls();
this.disableTabs();

1
apps/user_ldap/l10n/pt_PT.js
View file

@ -66,6 +66,7 @@ OC.L10N.register(
"Verify settings" : "Verificar definições",
"1. Server" : "1. Servidor",
"%s. Server:" : "%s. Servvidor",
"Add a new and blank configuration" : "Adicione uma nova configuração em branco",
"Delete the current configuration" : "Apagar a configuração actual",
"Host" : "Anfitrião",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",

1
apps/user_ldap/l10n/pt_PT.json
View file

@ -64,6 +64,7 @@
"Verify settings" : "Verificar definições",
"1. Server" : "1. Servidor",
"%s. Server:" : "%s. Servvidor",
"Add a new and blank configuration" : "Adicione uma nova configuração em branco",
"Delete the current configuration" : "Apagar a configuração actual",
"Host" : "Anfitrião",
"You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",

5
apps/user_ldap/lib/access.php
View file

@ -35,6 +35,7 @@
namespace OCA\user_ldap\lib;
use OCA\user_ldap\lib\user\OfflineUser;
use OCA\User_LDAP\Mapping\AbstractMapping;
/**
@ -710,6 +711,10 @@ class Access extends LDAPUtility implements user\IUserTools {
$ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]);
$this->cacheUserExists($ocName);
$user = $this->userManager->get($ocName);
if($user instanceof OfflineUser) {
$user->unmark();
$user = $this->userManager->get($ocName);
}
$user->processAttributes($userRecord);
}
}

7
apps/user_ldap/lib/user/offlineuser.php
View file

@ -85,6 +85,13 @@ class OfflineUser {
$this->fetchDetails();
}
/**
* remove the Delete-flag from the user.
*/
public function unmark() {
$this->config->setUserValue($this->ocName, 'user_ldap', 'isDeleted', '0');
}
/**
* exports the user details in an assoc array
* @return array

5
config/config.sample.php
View file

@ -879,11 +879,16 @@ $CONFIG = array(
/**
* Connection details for redis to use for memory caching.
*
* For enhanced security it is recommended to configure Redis
* to require a password. See http://redis.io/topics/security
* for more information.
*/
'redis' => array(
'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
'port' => 6379,
'timeout' => 0.0,
'password' => '', // Optional, if not defined no password will be used.
'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
),

2
core/js/js.js
View file

@ -1295,7 +1295,7 @@ function initCore() {
*/
function setupMainMenu() {
// toggle the navigation
var $toggle = $('#header .menutoggle');
var $toggle = $('#header .header-appname-container');
var $navigation = $('#navigation');
// init the menu

3
core/js/tests/specs/coreSpec.js
View file

@ -458,12 +458,11 @@ describe('Core base tests', function() {
var clock;
var $toggle;
var $navigation;
var clock;
beforeEach(function() {
clock = sinon.useFakeTimers();
$('#testArea').append('<div id="header">' +
'<a class="menutoggle" href="#">' +
'<a class="menutoggle header-appname-container" href="#">' +
'<h1 class="header-appname"></h1>' +
'<div class="icon-caret"></div>' +
'</a>' +

3
core/l10n/cs_CZ.js
View file

@ -250,6 +250,7 @@ OC.L10N.register(
"Finishing …" : "Dokončuji...",
"Need help?" : "Potřebujete pomoc?",
"See the documentation" : "Shlédnout dokumentaci",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
"Log out" : "Odhlásit se",
"Search" : "Hledat",
@ -259,8 +260,8 @@ OC.L10N.register(
"Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
"Log in" : "Přihlásit",
"Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
"Stay logged in" : "Neodhlašovat",
"Alternative Logins" : "Alternativní přihlášení",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
"This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
"This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
"Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",

3
core/l10n/cs_CZ.json
View file

@ -248,6 +248,7 @@
"Finishing …" : "Dokončuji...",
"Need help?" : "Potřebujete pomoc?",
"See the documentation" : "Shlédnout dokumentaci",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
"Log out" : "Odhlásit se",
"Search" : "Hledat",
@ -257,8 +258,8 @@
"Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
"Log in" : "Přihlásit",
"Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
"Stay logged in" : "Neodhlašovat",
"Alternative Logins" : "Alternativní přihlášení",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
"This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
"This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
"Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",

3
core/l10n/el.js
View file

@ -172,6 +172,7 @@ OC.L10N.register(
"_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
"{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.",
"Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
"An error occurred." : "Παρουσιάστηκε σφάλμα",
"Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
"The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.",
"The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.",
@ -244,6 +245,7 @@ OC.L10N.register(
"Finishing …" : "Ολοκλήρωση...",
"Need help?" : "Θέλετε βοήθεια;",
"See the documentation" : "Δείτε την τεκμηρίωση",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
"Log out" : "Αποσύνδεση",
"Search" : "Αναζήτηση",
@ -254,7 +256,6 @@ OC.L10N.register(
"Log in" : "Είσοδος",
"Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
"Alternative Logins" : "Εναλλακτικές Συνδέσεις",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
"This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
"This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
"Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",

3
core/l10n/el.json
View file

@ -170,6 +170,7 @@
"_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
"{version} is available. Get more information on how to update." : "Η έκδοση {version} είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες για το πως να κάνετε την ενημέρωση.",
"Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
"An error occurred." : "Παρουσιάστηκε σφάλμα",
"Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
"The update was unsuccessful. " : "Η ενημέρωση ήταν ανεπιτυχής.",
"The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.",
@ -242,6 +243,7 @@
"Finishing …" : "Ολοκλήρωση...",
"Need help?" : "Θέλετε βοήθεια;",
"See the documentation" : "Δείτε την τεκμηρίωση",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
"Log out" : "Αποσύνδεση",
"Search" : "Αναζήτηση",
@ -252,7 +254,6 @@
"Log in" : "Είσοδος",
"Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
"Alternative Logins" : "Εναλλακτικές Συνδέσεις",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
"This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
"This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
"Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",

3
core/l10n/pt_PT.js
View file

@ -148,6 +148,7 @@ OC.L10N.register(
"change" : "alterar",
"delete" : "apagar",
"access control" : "controlo de acesso",
"Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.",
"An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
"Share" : "Compartilhar",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
@ -185,6 +186,7 @@ OC.L10N.register(
"New Password" : "Nova palavra-passe",
"Reset password" : "Repor palavra-passe",
"Searching other places" : "A pesquisar noutros lugares",
"No search results in other folders" : "Sem resultados de procura nas outras pastas",
"Personal" : "Pessoal",
"Users" : "Utilizadores",
"Apps" : "Apps",
@ -251,6 +253,7 @@ OC.L10N.register(
"Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
"Log in" : "Iniciar Sessão",
"Wrong password. Reset it?" : "Senha errada. Repô-la?",
"Stay logged in" : "Manter sessão iniciada",
"Alternative Logins" : "Contas de acesso alternativas",
"This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
"This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",

3
core/l10n/pt_PT.json
View file

@ -146,6 +146,7 @@
"change" : "alterar",
"delete" : "apagar",
"access control" : "controlo de acesso",
"Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.",
"An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
"Share" : "Compartilhar",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
@ -183,6 +184,7 @@
"New Password" : "Nova palavra-passe",
"Reset password" : "Repor palavra-passe",
"Searching other places" : "A pesquisar noutros lugares",
"No search results in other folders" : "Sem resultados de procura nas outras pastas",
"Personal" : "Pessoal",
"Users" : "Utilizadores",
"Apps" : "Apps",
@ -249,6 +251,7 @@
"Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
"Log in" : "Iniciar Sessão",
"Wrong password. Reset it?" : "Senha errada. Repô-la?",
"Stay logged in" : "Manter sessão iniciada",
"Alternative Logins" : "Contas de acesso alternativas",
"This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
"This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",

3
core/l10n/zh_TW.js
View file

@ -154,6 +154,7 @@ OC.L10N.register(
"change" : "更動",
"delete" : "刪除",
"access control" : "存取控制",
"Share details could not be loaded for this item." : "無法載入分享細節",
"An error occured. Please try again" : "發生錯誤，請重試",
"Share" : "分享",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud",
@ -250,6 +251,7 @@ OC.L10N.register(
"Finishing …" : "即將完成…",
"Need help?" : "需要幫助？",
"See the documentation" : "閱讀說明文件",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作，請{linkstart}啟用Javascript{linkend}然後重新整理頁面。",
"Log out" : "登出",
"Search" : "搜尋",
@ -261,7 +263,6 @@ OC.L10N.register(
"Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
"Stay logged in" : "保持登入狀態",
"Alternative Logins" : "其他登入方法",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
"This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
"This means only administrators can use the instance." : "這表示只有系統管理員能夠使用",
"Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員",

3
core/l10n/zh_TW.json
View file

@ -152,6 +152,7 @@
"change" : "更動",
"delete" : "刪除",
"access control" : "存取控制",
"Share details could not be loaded for this item." : "無法載入分享細節",
"An error occured. Please try again" : "發生錯誤，請重試",
"Share" : "分享",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud",
@ -248,6 +249,7 @@
"Finishing …" : "即將完成…",
"Need help?" : "需要幫助？",
"See the documentation" : "閱讀說明文件",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作，請{linkstart}啟用Javascript{linkend}然後重新整理頁面。",
"Log out" : "登出",
"Search" : "搜尋",
@ -259,7 +261,6 @@
"Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
"Stay logged in" : "保持登入狀態",
"Alternative Logins" : "其他登入方法",
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
"This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
"This means only administrators can use the instance." : "這表示只有系統管理員能夠使用",
"Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員",

2
core/templates/layout.user.php
View file

@ -63,7 +63,7 @@
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div id="settings" class="svg">
<div id="expand" tabindex="6" role="link">
<div id="expand" tabindex="6" role="link" class="menutoggle">
<?php if ($_['enableAvatars']): ?>
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
<?php if ($_['userAvatarSet']): ?>

1
lib/l10n/pt_PT.js
View file

@ -46,6 +46,7 @@ OC.L10N.register(
"Can't read file" : "Não é possível ler o ficheiro",
"App directory already exists" : "A directoria da aplicação já existe",
"Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
"Archive does not contain a directory named %s" : "O arquivo não contém uma diretoria com o nome %s",
"No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
"No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
"No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",

1
lib/l10n/pt_PT.json
View file

@ -44,6 +44,7 @@
"Can't read file" : "Não é possível ler o ficheiro",
"App directory already exists" : "A directoria da aplicação já existe",
"Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
"Archive does not contain a directory named %s" : "O arquivo não contém uma diretoria com o nome %s",
"No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
"No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
"No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",

9
lib/private/appframework/dependencyinjection/dicontainer.php
View file

@ -252,11 +252,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
});
$this->registerService('Protocol', function($c){
if(isset($_SERVER['SERVER_PROTOCOL'])) {
return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
} else {
return new Http($_SERVER);
}
/** @var \OC\Server $server */
$server = $c->query('ServerContainer');
$protocol = $server->getRequest()->getHttpProtocol();
return new Http($_SERVER, $protocol);
});
$this->registerService('Dispatcher', function($c) {

1
lib/private/appframework/http.php
View file

@ -112,6 +112,7 @@ class Http extends BaseHttp {
* @param Http::CONSTANT $status the constant from the Http class
* @param \DateTime $lastModified formatted last modified date
* @param string $ETag the etag
* @return string
*/
public function getStatusHeader($status, \DateTime $lastModified=null,
$ETag=null) {

3
lib/private/memcache/redis.php
View file

@ -56,6 +56,9 @@ class Redis extends Cache implements IMemcache {
}
self::$cache->connect($host, $port, $timeout);
if(isset($config['password']) && $config['password'] !== '') {
self::$cache->auth($config['password']);
}
if (isset($config['dbindex'])) {
self::$cache->select($config['dbindex']);

2
lib/private/response.php
View file

@ -74,7 +74,7 @@ class OC_Response {
* @param int $status a HTTP status code, see also the STATUS constants
*/
static public function setStatus($status) {
$protocol = $_SERVER['SERVER_PROTOCOL'];
$protocol = \OC::$server->getRequest()->getHttpProtocol();
switch($status) {
case self::STATUS_NOT_MODIFIED:
$status = $status . ' Not Modified';

1
settings/l10n/cs_CZ.js
View file

@ -80,6 +80,7 @@ OC.L10N.register(
"Uninstall" : "Odinstalovat",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.",
"App update" : "Aktualizace aplikace",
"No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"",
"An error occurred: {message}" : "Nastala chyba: {message}",
"Select a profile picture" : "Vyberte profilový obrázek",
"Very weak password" : "Velmi slabé heslo",

1
settings/l10n/cs_CZ.json
View file

@ -78,6 +78,7 @@
"Uninstall" : "Odinstalovat",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikace byla povolena ale je třeba ji aktualizovat. Za 5 sekund budete přesměrování na stránku pro aktualizaci.",
"App update" : "Aktualizace aplikace",
"No apps found for \"{query}\"" : "Nebyly nalezeny žádné aplikace pro \"{query}\"",
"An error occurred: {message}" : "Nastala chyba: {message}",
"Select a profile picture" : "Vyberte profilový obrázek",
"Very weak password" : "Velmi slabé heslo",

5
settings/l10n/es.js
View file

@ -78,6 +78,9 @@ OC.L10N.register(
"Uninstalling ...." : "Desinstalando...",
"Error while uninstalling app" : "Error al desinstalar la aplicación",
"Uninstall" : "Desinstalar",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.",
"App update" : "Actualización de aplicación",
"No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"",
"An error occurred: {message}" : "Ocurrió un error: {message}",
"Select a profile picture" : "Seleccionar una imagen de perfil",
"Very weak password" : "Contraseña muy débil",
@ -126,11 +129,13 @@ OC.L10N.register(
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
"%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
"Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta desactivado, esto pruede provocar problemas con \"race conditions\". Activa 'filelocking.enabled' en config.php para evitar estos problemas. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.",
"System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
"This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
"Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta usando la base de datos como mecanismo de bloqueo, para mejorar el rendimiento es recomendable usar cacheo de memoria para los bloqueos. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
"All checks passed." : "Ha pasado todos los controles",
"Open documentation" : "Documentación abierta",

5
settings/l10n/es.json
View file

@ -76,6 +76,9 @@
"Uninstalling ...." : "Desinstalando...",
"Error while uninstalling app" : "Error al desinstalar la aplicación",
"Uninstall" : "Desinstalar",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La aplicación ha sido activada pero necesita ser actualizada. Seras redirigido a la pagina de actualizariones en 5 segundos.",
"App update" : "Actualización de aplicación",
"No apps found for \"{query}\"" : "No se han encontrado aplicaciones para \"{query}\"",
"An error occurred: {message}" : "Ocurrió un error: {message}",
"Select a profile picture" : "Seleccionar una imagen de perfil",
"Very weak password" : "Contraseña muy débil",
@ -124,11 +127,13 @@
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
"%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
"Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta desactivado, esto pruede provocar problemas con \"race conditions\". Activa 'filelocking.enabled' en config.php para evitar estos problemas. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.",
"System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
"This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
"Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "El fichero de bloqueo de transaciones esta usando la base de datos como mecanismo de bloqueo, para mejorar el rendimiento es recomendable usar cacheo de memoria para los bloqueos. Visita la <a target=\"_blank\" href=\"%s\">documentación ↗</a> para mas información.",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
"All checks passed." : "Ha pasado todos los controles",
"Open documentation" : "Documentación abierta",

3
settings/l10n/ja.js
View file

@ -80,6 +80,7 @@ OC.L10N.register(
"Uninstall" : "アンインストール",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。",
"App update" : "アプリのアップデート",
"No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません",
"An error occurred: {message}" : "エラーが発生しました: {message}",
"Select a profile picture" : "プロファイル画像を選択",
"Very weak password" : "非常に弱いパスワード",
@ -134,6 +135,7 @@ OC.L10N.register(
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合は、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI から cronジョブを実行することができませんでした。次の技術的なエラーが発生しています：",
"Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "トランザクションファイルのロックは、データベースを使用してバックエンドのロックをしています。最高のパフォーマンスのためには、ロック用に memcache を設定することをお勧めします。詳細については、<a target=\"_blank\" href=\"%s\">ドキュメント↗ </a>を参照してください。",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
"All checks passed." : "すべてのチェックに合格しました。",
"Open documentation" : "ドキュメントを開く",
@ -203,6 +205,7 @@ OC.L10N.register(
"Version" : "バージョン",
"Developer documentation" : "開発者ドキュメント",
"Experimental applications ahead" : "実験的なアプリケーションを試す",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "実験的なアプリは、脆弱性についてチェックされていませんし、不安定であったり、激しく開発中です。それらをインストールすると、データの損失やセキュリティ侵害を引き起こす可能性があります。",
"by" : "by",
"licensed" : "ライセンス",
"Documentation:" : "ドキュメント:",

3
settings/l10n/ja.json
View file

@ -78,6 +78,7 @@
"Uninstall" : "アンインストール",
"The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "アプリは有効ですが、更新が必要です。5秒後に更新ページにリダイレクトします。",
"App update" : "アプリのアップデート",
"No apps found for \"{query}\"" : "\"{query}\" に対応するアプリはありません",
"An error occurred: {message}" : "エラーが発生しました: {message}",
"Select a profile picture" : "プロファイル画像を選択",
"Very weak password" : "非常に弱いパスワード",
@ -132,6 +133,7 @@
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合は、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI から cronジョブを実行することができませんでした。次の技術的なエラーが発生しています：",
"Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "トランザクションファイルのロックは、データベースを使用してバックエンドのロックをしています。最高のパフォーマンスのためには、ロック用に memcache を設定することをお勧めします。詳細については、<a target=\"_blank\" href=\"%s\">ドキュメント↗ </a>を参照してください。",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
"All checks passed." : "すべてのチェックに合格しました。",
"Open documentation" : "ドキュメントを開く",
@ -201,6 +203,7 @@
"Version" : "バージョン",
"Developer documentation" : "開発者ドキュメント",
"Experimental applications ahead" : "実験的なアプリケーションを試す",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "実験的なアプリは、脆弱性についてチェックされていませんし、不安定であったり、激しく開発中です。それらをインストールすると、データの損失やセキュリティ侵害を引き起こす可能性があります。",
"by" : "by",
"licensed" : "ライセンス",
"Documentation:" : "ドキュメント:",

3
settings/l10n/pt_PT.js
View file

@ -5,6 +5,7 @@ OC.L10N.register(
"Redis" : "Redis",
"Security & setup warnings" : "Avisos de configuração e segurança",
"Sharing" : "Partilha",
"Server-side encryption" : "Atualizar App",
"External Storage" : "Armazenamento Externo",
"Cron" : "Cron",
"Email server" : "Servidor de Correio Eletrónico",
@ -73,6 +74,7 @@ OC.L10N.register(
"Uninstalling ...." : "A desinstalar....",
"Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
"Uninstall" : "Desinstalar",
"App update" : "Atualizar App",
"An error occurred: {message}" : "Ocorreu um erro: {message}",
"Select a profile picture" : "Selecione uma fotografia de perfil",
"Very weak password" : "Palavra-passe muito fraca",
@ -146,6 +148,7 @@ OC.L10N.register(
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
"Enable encryption" : "Ative a encriptação",
"Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
"Start migration" : "Iniciar migração",
"This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
"Send mode" : "Modo de Envio",

3
settings/l10n/pt_PT.json
View file

@ -3,6 +3,7 @@
"Redis" : "Redis",
"Security & setup warnings" : "Avisos de configuração e segurança",
"Sharing" : "Partilha",
"Server-side encryption" : "Atualizar App",
"External Storage" : "Armazenamento Externo",
"Cron" : "Cron",
"Email server" : "Servidor de Correio Eletrónico",
@ -71,6 +72,7 @@
"Uninstalling ...." : "A desinstalar....",
"Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
"Uninstall" : "Desinstalar",
"App update" : "Atualizar App",
"An error occurred: {message}" : "Ocorreu um erro: {message}",
"Select a profile picture" : "Selecione uma fotografia de perfil",
"Very weak password" : "Palavra-passe muito fraca",
@ -144,6 +146,7 @@
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
"Enable encryption" : "Ative a encriptação",
"Select default encryption module:" : "Selecionar o módulo de encriptação predefinido:",
"Start migration" : "Iniciar migração",
"This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
"Send mode" : "Modo de Envio",