aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Command/Maintenance/Install.php7
-rw-r--r--core/Controller/AppPasswordController.php2
-rw-r--r--core/Controller/ClientFlowLoginController.php2
-rw-r--r--core/Controller/ClientFlowLoginV2Controller.php2
-rw-r--r--core/Controller/PreviewController.php2
-rw-r--r--core/js/tests/specs/l10nSpec.js63
-rw-r--r--core/l10n/fr.js114
-rw-r--r--core/l10n/fr.json114
-rw-r--r--core/l10n/ga.js1
-rw-r--r--core/l10n/ga.json1
-rw-r--r--core/l10n/pt_BR.js1
-rw-r--r--core/l10n/pt_BR.json1
-rw-r--r--core/l10n/ru.js36
-rw-r--r--core/l10n/ru.json36
-rw-r--r--core/l10n/sr.js1
-rw-r--r--core/l10n/sr.json1
-rw-r--r--core/openapi-full.json4
-rw-r--r--core/openapi.json4
-rw-r--r--core/templates/403.php18
19 files changed, 332 insertions, 78 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 84fd832e016..48fcb335583 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -44,6 +44,7 @@ class Install extends Command {
->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'Login to connect to the database')
->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
+ ->addOption('disable-admin-user', null, InputOption::VALUE_NONE, 'Disable the creation of an admin user')
->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'Login of the admin account', 'admin')
->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
@@ -120,6 +121,7 @@ class Install extends Command {
if ($input->hasParameterOption('--database-pass')) {
$dbPass = (string)$input->getOption('database-pass');
}
+ $disableAdminUser = (bool)$input->getOption('disable-admin-user');
$adminLogin = $input->getOption('admin-user');
$adminPassword = $input->getOption('admin-pass');
$adminEmail = $input->getOption('admin-email');
@@ -142,7 +144,7 @@ class Install extends Command {
}
}
- if (is_null($adminPassword)) {
+ if (!$disableAdminUser && $adminPassword === null) {
/** @var QuestionHelper $helper */
$helper = $this->getHelper('question');
$question = new Question('What is the password you like to use for the admin account <' . $adminLogin . '>?');
@@ -151,7 +153,7 @@ class Install extends Command {
$adminPassword = $helper->ask($input, $output, $question);
}
- if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
+ if (!$disableAdminUser && $adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
}
@@ -161,6 +163,7 @@ class Install extends Command {
'dbpass' => $dbPass,
'dbname' => $dbName,
'dbhost' => $dbHost,
+ 'admindisable' => $disableAdminUser,
'adminlogin' => $adminLogin,
'adminpass' => $adminPassword,
'adminemail' => $adminEmail,
diff --git a/core/Controller/AppPasswordController.php b/core/Controller/AppPasswordController.php
index 41a45926ba7..e5edc165bf5 100644
--- a/core/Controller/AppPasswordController.php
+++ b/core/Controller/AppPasswordController.php
@@ -77,7 +77,7 @@ class AppPasswordController extends OCSController {
$password = null;
}
- $userAgent = $this->request->getHeader('USER_AGENT');
+ $userAgent = $this->request->getHeader('user-agent');
$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
index 0e6e1fc8404..57ea20071b6 100644
--- a/core/Controller/ClientFlowLoginController.php
+++ b/core/Controller/ClientFlowLoginController.php
@@ -65,7 +65,7 @@ class ClientFlowLoginController extends Controller {
}
private function getClientName(): string {
- $userAgent = $this->request->getHeader('USER_AGENT');
+ $userAgent = $this->request->getHeader('user-agent');
return $userAgent !== '' ? $userAgent : 'unknown';
}
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php
index 84212002895..8c0c1e8179d 100644
--- a/core/Controller/ClientFlowLoginV2Controller.php
+++ b/core/Controller/ClientFlowLoginV2Controller.php
@@ -293,7 +293,7 @@ class ClientFlowLoginV2Controller extends Controller {
#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function init(): JSONResponse {
// Get client user agent
- $userAgent = $this->request->getHeader('USER_AGENT');
+ $userAgent = $this->request->getHeader('user-agent');
$tokens = $this->loginFlowV2Service->createTokens($userAgent);
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index ea90be31078..7dd14b19f79 100644
--- a/core/Controller/PreviewController.php
+++ b/core/Controller/PreviewController.php
@@ -152,7 +152,7 @@ class PreviewController extends Controller {
// Is this header is set it means our UI is doing a preview for no-download shares
// we check a header so we at least prevent people from using the link directly (obfuscation)
- $isNextcloudPreview = $this->request->getHeader('X-NC-Preview') === 'true';
+ $isNextcloudPreview = $this->request->getHeader('x-nc-preview') === 'true';
$storage = $node->getStorage();
if ($isNextcloudPreview === false && $storage->instanceOfStorage(ISharedStorage::class)) {
/** @var ISharedStorage $storage */
diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js
index 03f7fd50796..bd93a13fe74 100644
--- a/core/js/tests/specs/l10nSpec.js
+++ b/core/js/tests/specs/l10nSpec.js
@@ -110,67 +110,4 @@ describe('OC.L10N tests', function() {
checkPlurals();
});
});
- describe('async loading of translations', function() {
- afterEach(() => {
- document.documentElement.removeAttribute('data-locale')
- })
- it('loads bundle for given app and calls callback', function(done) {
- document.documentElement.setAttribute('data-locale', 'zh_CN')
- var callbackStub = sinon.stub();
- var promiseStub = sinon.stub();
- var loading = OC.L10N.load(TEST_APP, callbackStub);
- expect(callbackStub.notCalled).toEqual(true);
- var req = fakeServer.requests[0];
-
- console.warn('fff-', window.OC.appswebroots)
- loading
- .then(promiseStub)
- .then(function() {
- expect(fakeServer.requests.length).toEqual(1);
- expect(req.url).toEqual(
- OC.getRootPath() + '/apps3/' + TEST_APP + '/l10n/zh_CN.json'
- );
-
- expect(callbackStub.calledOnce).toEqual(true);
- expect(promiseStub.calledOnce).toEqual(true);
- expect(t(TEST_APP, 'Hello world!')).toEqual('你好世界!');
- })
- .then(done)
- .catch(e => expect(e).toBe('No error expected!'));
-
- expect(promiseStub.notCalled).toEqual(true);
- req.respond(
- 200,
- { 'Content-Type': 'application/json' },
- JSON.stringify({
- translations: {'Hello world!': '你好世界!'},
- pluralForm: 'nplurals=2; plural=(n != 1);'
- })
- );
- });
- it('calls callback if translation already available', function(done) {
- var callbackStub = sinon.stub();
- spyOn(console, 'warn');
- OC.L10N.register(TEST_APP, {
- 'Hello world!': 'Hallo Welt!'
- });
- OC.L10N.load(TEST_APP, callbackStub)
- .then(function() {
- expect(callbackStub.calledOnce).toEqual(true);
- expect(fakeServer.requests.length).toEqual(0);
- })
- .then(done);
-
- });
- it('calls callback if locale is en', function(done) {
- var callbackStub = sinon.stub();
- OC.L10N.load(TEST_APP, callbackStub)
- .then(function() {
- expect(callbackStub.calledOnce).toEqual(true);
- expect(fakeServer.requests.length).toEqual(0);
- })
- .then(done)
- .catch(done);
- });
- });
});
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 9f9629b802c..850800e0829 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -80,8 +80,122 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatible)",
"The following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
"Already up to date" : "Déjà à jour",
+ "Electronic book document" : "Livre électronique",
+ "GPX geographic data" : "Donnée géographique GPX",
+ "Gzip archive" : "Archive Gzip",
+ "Adobe Illustrator document" : "Document Adobe Illustrator",
+ "Java source code" : "Code source Java",
+ "JavaScript source code" : "Code source Javascript",
+ "JSON document" : "Document JSON",
+ "Microsoft Access database" : "Base de données Microsoft Access",
+ "Microsoft OneNote document" : "Document Microsoft One Note",
+ "Microsoft Word document" : "Document Microsoft Word",
"Unknown" : "Inconnu",
+ "PDF document" : "Document PDF",
+ "PostScript document" : "Document PostScript",
+ "RSS summary" : "Résumé RSS",
+ "Android package" : "Paquet Android",
+ "KML geographic data" : "Donné géographique KML",
+ "KML geographic compressed data" : "Donnée géographique compressée KML",
+ "Lotus Word Pro document" : "Document Lotus Word Pro",
+ "Excel spreadsheet" : "Feuille de calcul Excel",
+ "Excel add-in" : "Complément Excel",
+ "Excel 2007 binary spreadsheet" : "Feuille de calcul binaire Excel 2007",
+ "Excel spreadsheet template" : "Modèle de feuille de calcul Excel",
+ "Outlook Message" : "Message Outlook",
+ "PowerPoint presentation" : "Présentation Powerpoint",
+ "PowerPoint add-in" : "Complément PowerPoint",
+ "PowerPoint presentation template" : "Modèle de présentation PowerPoint",
+ "Word document" : "Document Word",
+ "ODF formula" : "Formule ODF",
+ "ODG drawing" : "Dessin ODG",
+ "ODG drawing (Flat XML)" : "Dessin ODG (XML à plat)",
+ "ODG template" : "Modèle ODG",
+ "ODP presentation" : "Présentation ODP",
+ "ODP presentation (Flat XML)" : "Présentation ODP (XML à plat)",
+ "ODP template" : "Modèle ODP",
+ "ODS spreadsheet" : "Feuille de calcul ODS",
+ "ODS spreadsheet (Flat XML)" : "Feuille de calcul ODS (XML à plat)",
+ "ODS template" : "Modèle ODS",
+ "ODT document" : "Document ODT",
+ "ODT document (Flat XML)" : "Document ODF (XML à plat)",
+ "ODT template" : "Modèle ODT",
+ "PowerPoint 2007 presentation" : "Présentation PowerPoint 2007",
+ "PowerPoint 2007 show" : "Diaporama PowerPoint 2007",
+ "PowerPoint 2007 presentation template" : "Modèle de présentation PowerPoint 2007",
+ "Excel 2007 spreadsheet" : "Feuille de calcul Excel 2007",
+ "Excel 2007 spreadsheet template" : "Modèle de feuille de calcul Excel 2007",
+ "Word 2007 document" : "Document Word 2007",
+ "Word 2007 document template" : "Modèle de document Word 2007",
+ "Microsoft Visio document" : "Document Microsoft Visio",
+ "WordPerfect document" : "Document WordPerfect",
+ "7-zip archive" : "Archive 7-zip",
+ "Blender scene" : "Scène Blender",
+ "Bzip2 archive" : "Archive Bzip2",
+ "Debian package" : "Paquet Debian",
+ "FictionBook document" : "Document FictionBook",
+ "Unknown font" : "Police de caractère inconnue",
+ "Krita document" : "Document Krita",
+ "Mobipocket e-book" : "Livre électronique Mobipocket",
+ "Windows Installer package" : "Paquet d'installation Windows",
+ "Perl script" : "Script Perl",
+ "PHP script" : "Script PHP",
+ "Tar archive" : "Archive Tar",
+ "XML document" : "Document XML",
+ "YAML document" : "Document YAML",
+ "Zip archive" : "Archive Zip",
+ "Zstandard archive" : "Archive Zstandard",
+ "AAC audio" : "Fichier audio AAC",
+ "FLAC audio" : "Fichier audio FLAC",
+ "MPEG-4 audio" : "Fichier audio MPEG-4",
+ "MP3 audio" : "Fichier audio MP3",
+ "Ogg audio" : "Fichier audio Ogg",
+ "RIFF/WAVe standard Audio" : "Fichier audio standard RIFF/WAVe",
+ "WebM audio" : "Fichier audio WebM",
+ "MP3 ShoutCast playlist" : "Liste de lecture ShoutCast MP3",
+ "Windows BMP image" : "Image Windows BMP",
+ "Better Portable Graphics image" : "Image Better Portable Graphics",
+ "EMF image" : "Image EMF",
+ "GIF image" : "Image GIF",
+ "HEIC image" : "Image HEIC",
+ "HEIF image" : "Image HEIF",
+ "JPEG-2000 JP2 image" : "Image JPEG-2000 JP2",
+ "JPEG image" : "Image JPEG",
"PNG image" : "Image PNG",
+ "SVG image" : "Image SVG",
+ "Truevision Targa image" : "Image Truevision Targa",
+ "TIFF image" : "Image TIFF",
+ "WebP image" : "Image WebP",
+ "Digital raw image" : "Image Digital raw",
+ "Windows Icon" : "Icône Windows",
+ "Email message" : "Courrier électronique",
+ "VCS/ICS calendar" : "Calendrier VCS/ICS",
+ "CSS stylesheet" : "Feuille de style CSS",
+ "CSV document" : "Document CSV",
+ "HTML document" : "Document HTML",
+ "Markdown document" : "Document Markdown",
+ "Org-mode file" : "Fichier Org-mode",
+ "Plain text document" : "Document texte brut",
+ "Rich Text document" : "Document texte enrichi",
+ "Electronic business card" : "Carte de visite électronique",
+ "C++ source code" : "Code source C++",
+ "LDIF address book" : "Carnet d'adresses LDIF",
+ "NFO document" : "Document NFO",
+ "PHP source" : "Code source PHP",
+ "Python script" : "Script Python",
+ "ReStructuredText document" : "Document ReStructuredText",
+ "3GPP multimedia file" : "Fichier multimédia 3GPP",
+ "MPEG video" : "Vidéo MPEG",
+ "DV video" : "Vidéo DV",
+ "MPEG-2 transport stream" : "Flux de transport MPEG-2",
+ "MPEG-4 video" : "Vidéo MPEG-4",
+ "Ogg video" : "Vidéo OGG",
+ "QuickTime video" : "Vidéo QuickTime",
+ "WebM video" : "Vidéo WebM",
+ "Flash video" : "Vidéo Flash",
+ "Matroska video" : "Vidéo Matroska",
+ "Windows Media video" : "Vidéo Windows Media",
+ "AVI video" : "Vidéo AVI",
"Error occurred while checking server setup" : "Une erreur s’est produite lors de la vérification de la configuration du serveur",
"For more details see the {linkstart}documentation ↗{linkend}." : "Pour plus d’information, voir la {linkstart}documentation ↗{linkend}.",
"unknown text" : "texte inconnu",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index c187c3fc02d..00d39e5f5a5 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -78,8 +78,122 @@
"%s (incompatible)" : "%s (incompatible)",
"The following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
"Already up to date" : "Déjà à jour",
+ "Electronic book document" : "Livre électronique",
+ "GPX geographic data" : "Donnée géographique GPX",
+ "Gzip archive" : "Archive Gzip",
+ "Adobe Illustrator document" : "Document Adobe Illustrator",
+ "Java source code" : "Code source Java",
+ "JavaScript source code" : "Code source Javascript",
+ "JSON document" : "Document JSON",
+ "Microsoft Access database" : "Base de données Microsoft Access",
+ "Microsoft OneNote document" : "Document Microsoft One Note",
+ "Microsoft Word document" : "Document Microsoft Word",
"Unknown" : "Inconnu",
+ "PDF document" : "Document PDF",
+ "PostScript document" : "Document PostScript",
+ "RSS summary" : "Résumé RSS",
+ "Android package" : "Paquet Android",
+ "KML geographic data" : "Donné géographique KML",
+ "KML geographic compressed data" : "Donnée géographique compressée KML",
+ "Lotus Word Pro document" : "Document Lotus Word Pro",
+ "Excel spreadsheet" : "Feuille de calcul Excel",
+ "Excel add-in" : "Complément Excel",
+ "Excel 2007 binary spreadsheet" : "Feuille de calcul binaire Excel 2007",
+ "Excel spreadsheet template" : "Modèle de feuille de calcul Excel",
+ "Outlook Message" : "Message Outlook",
+ "PowerPoint presentation" : "Présentation Powerpoint",
+ "PowerPoint add-in" : "Complément PowerPoint",
+ "PowerPoint presentation template" : "Modèle de présentation PowerPoint",
+ "Word document" : "Document Word",
+ "ODF formula" : "Formule ODF",
+ "ODG drawing" : "Dessin ODG",
+ "ODG drawing (Flat XML)" : "Dessin ODG (XML à plat)",
+ "ODG template" : "Modèle ODG",
+ "ODP presentation" : "Présentation ODP",
+ "ODP presentation (Flat XML)" : "Présentation ODP (XML à plat)",
+ "ODP template" : "Modèle ODP",
+ "ODS spreadsheet" : "Feuille de calcul ODS",
+ "ODS spreadsheet (Flat XML)" : "Feuille de calcul ODS (XML à plat)",
+ "ODS template" : "Modèle ODS",
+ "ODT document" : "Document ODT",
+ "ODT document (Flat XML)" : "Document ODF (XML à plat)",
+ "ODT template" : "Modèle ODT",
+ "PowerPoint 2007 presentation" : "Présentation PowerPoint 2007",
+ "PowerPoint 2007 show" : "Diaporama PowerPoint 2007",
+ "PowerPoint 2007 presentation template" : "Modèle de présentation PowerPoint 2007",
+ "Excel 2007 spreadsheet" : "Feuille de calcul Excel 2007",
+ "Excel 2007 spreadsheet template" : "Modèle de feuille de calcul Excel 2007",
+ "Word 2007 document" : "Document Word 2007",
+ "Word 2007 document template" : "Modèle de document Word 2007",
+ "Microsoft Visio document" : "Document Microsoft Visio",
+ "WordPerfect document" : "Document WordPerfect",
+ "7-zip archive" : "Archive 7-zip",
+ "Blender scene" : "Scène Blender",
+ "Bzip2 archive" : "Archive Bzip2",
+ "Debian package" : "Paquet Debian",
+ "FictionBook document" : "Document FictionBook",
+ "Unknown font" : "Police de caractère inconnue",
+ "Krita document" : "Document Krita",
+ "Mobipocket e-book" : "Livre électronique Mobipocket",
+ "Windows Installer package" : "Paquet d'installation Windows",
+ "Perl script" : "Script Perl",
+ "PHP script" : "Script PHP",
+ "Tar archive" : "Archive Tar",
+ "XML document" : "Document XML",
+ "YAML document" : "Document YAML",
+ "Zip archive" : "Archive Zip",
+ "Zstandard archive" : "Archive Zstandard",
+ "AAC audio" : "Fichier audio AAC",
+ "FLAC audio" : "Fichier audio FLAC",
+ "MPEG-4 audio" : "Fichier audio MPEG-4",
+ "MP3 audio" : "Fichier audio MP3",
+ "Ogg audio" : "Fichier audio Ogg",
+ "RIFF/WAVe standard Audio" : "Fichier audio standard RIFF/WAVe",
+ "WebM audio" : "Fichier audio WebM",
+ "MP3 ShoutCast playlist" : "Liste de lecture ShoutCast MP3",
+ "Windows BMP image" : "Image Windows BMP",
+ "Better Portable Graphics image" : "Image Better Portable Graphics",
+ "EMF image" : "Image EMF",
+ "GIF image" : "Image GIF",
+ "HEIC image" : "Image HEIC",
+ "HEIF image" : "Image HEIF",
+ "JPEG-2000 JP2 image" : "Image JPEG-2000 JP2",
+ "JPEG image" : "Image JPEG",
"PNG image" : "Image PNG",
+ "SVG image" : "Image SVG",
+ "Truevision Targa image" : "Image Truevision Targa",
+ "TIFF image" : "Image TIFF",
+ "WebP image" : "Image WebP",
+ "Digital raw image" : "Image Digital raw",
+ "Windows Icon" : "Icône Windows",
+ "Email message" : "Courrier électronique",
+ "VCS/ICS calendar" : "Calendrier VCS/ICS",
+ "CSS stylesheet" : "Feuille de style CSS",
+ "CSV document" : "Document CSV",
+ "HTML document" : "Document HTML",
+ "Markdown document" : "Document Markdown",
+ "Org-mode file" : "Fichier Org-mode",
+ "Plain text document" : "Document texte brut",
+ "Rich Text document" : "Document texte enrichi",
+ "Electronic business card" : "Carte de visite électronique",
+ "C++ source code" : "Code source C++",
+ "LDIF address book" : "Carnet d'adresses LDIF",
+ "NFO document" : "Document NFO",
+ "PHP source" : "Code source PHP",
+ "Python script" : "Script Python",
+ "ReStructuredText document" : "Document ReStructuredText",
+ "3GPP multimedia file" : "Fichier multimédia 3GPP",
+ "MPEG video" : "Vidéo MPEG",
+ "DV video" : "Vidéo DV",
+ "MPEG-2 transport stream" : "Flux de transport MPEG-2",
+ "MPEG-4 video" : "Vidéo MPEG-4",
+ "Ogg video" : "Vidéo OGG",
+ "QuickTime video" : "Vidéo QuickTime",
+ "WebM video" : "Vidéo WebM",
+ "Flash video" : "Vidéo Flash",
+ "Matroska video" : "Vidéo Matroska",
+ "Windows Media video" : "Vidéo Windows Media",
+ "AVI video" : "Vidéo AVI",
"Error occurred while checking server setup" : "Une erreur s’est produite lors de la vérification de la configuration du serveur",
"For more details see the {linkstart}documentation ↗{linkend}." : "Pour plus d’information, voir la {linkstart}documentation ↗{linkend}.",
"unknown text" : "texte inconnu",
diff --git a/core/l10n/ga.js b/core/l10n/ga.js
index d0b938cae09..b991dbfe7ec 100644
--- a/core/l10n/ga.js
+++ b/core/l10n/ga.js
@@ -44,6 +44,7 @@ OC.L10N.register(
"Task not found" : "Níor aimsíodh an tasc",
"Internal error" : "Earráid inmheánach",
"Not found" : "Ní bhfuarthas",
+ "Node is locked" : "Tá an nód faoi ghlas",
"Bad request" : "Drochiarratas",
"Requested task type does not exist" : "Níl an cineál taisc iarrtha ann",
"Necessary language model provider is not available" : "Níl soláthraí múnla teanga riachtanach ar fáil",
diff --git a/core/l10n/ga.json b/core/l10n/ga.json
index a63d5772554..ef0622fd1ef 100644
--- a/core/l10n/ga.json
+++ b/core/l10n/ga.json
@@ -42,6 +42,7 @@
"Task not found" : "Níor aimsíodh an tasc",
"Internal error" : "Earráid inmheánach",
"Not found" : "Ní bhfuarthas",
+ "Node is locked" : "Tá an nód faoi ghlas",
"Bad request" : "Drochiarratas",
"Requested task type does not exist" : "Níl an cineál taisc iarrtha ann",
"Necessary language model provider is not available" : "Níl soláthraí múnla teanga riachtanach ar fáil",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index dbcdfa4dfb1..556a6cd7392 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -44,6 +44,7 @@ OC.L10N.register(
"Task not found" : "Tarefa não encontrada",
"Internal error" : "Erro interno",
"Not found" : "Não encontrado",
+ "Node is locked" : "O nó está bloqueado",
"Bad request" : "Requisição inválida",
"Requested task type does not exist" : "O tipo de tarefa solicitado não existe",
"Necessary language model provider is not available" : "O provedor de modelo de linguagem necessário não está disponível",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index d60137b3c85..77c16d0b4c7 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -42,6 +42,7 @@
"Task not found" : "Tarefa não encontrada",
"Internal error" : "Erro interno",
"Not found" : "Não encontrado",
+ "Node is locked" : "O nó está bloqueado",
"Bad request" : "Requisição inválida",
"Requested task type does not exist" : "O tipo de tarefa solicitado não existe",
"Necessary language model provider is not available" : "O provedor de modelo de linguagem necessário não está disponível",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index ae9203a8c04..5f69bbf667c 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -44,6 +44,7 @@ OC.L10N.register(
"Task not found" : "Задача не найдена",
"Internal error" : "Внутренняя ошибка",
"Not found" : "Не найдено",
+ "Node is locked" : "Узел заблокирован",
"Bad request" : "Неверный запрос",
"Requested task type does not exist" : "Запрошенный тип задачи не существует",
"Necessary language model provider is not available" : "Необходимый поставщик языковой модели недоступен",
@@ -80,6 +81,7 @@ OC.L10N.register(
"%s (incompatible)" : "%s (несовместимое)",
"The following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
"Already up to date" : "Не нуждается в обновлении",
+ "Windows Command Script" : "Командный сценарий Windows",
"Electronic book document" : "Электронная книга",
"TrueType Font Collection" : "Набор шрифтов TrueType",
"Web Open Font Format" : "Файл шрифта в формате Open Font",
@@ -95,6 +97,8 @@ OC.L10N.register(
"Unknown" : "Неизвестно",
"PDF document" : "Документ в формате PDF",
"PostScript document" : "Документ в формате PostScript",
+ "RSS summary" : "RSS-сводка",
+ "Android package" : "Пакет Android",
"KML geographic data" : "Пространственные данные в формате MKL",
"KML geographic compressed data" : "Сжатые пространственные данные в формате KML",
"Lotus Word Pro document" : "Документ Lotus Word Pro",
@@ -114,6 +118,30 @@ OC.L10N.register(
"ODP presentation" : "Презентация в формате ODP",
"ODP presentation (Flat XML)" : "Презентация в формате ODP (простой XML)",
"ODP template" : "Шаблон ODP",
+ "ODS spreadsheet" : "Таблица ODS",
+ "ODS spreadsheet (Flat XML)" : "Таблица ODS (плоский XML)",
+ "ODS template" : "Шаблон ODS",
+ "ODT document" : "Документ ODT",
+ "ODT document (Flat XML)" : "Документ ODT (плоский XML)",
+ "ODT template" : "Шаблон ODT",
+ "PowerPoint 2007 presentation" : "Презентация PowerPoint 2007",
+ "PowerPoint 2007 show" : "Демонстрация PowerPoint 2007",
+ "PowerPoint 2007 presentation template" : "Шаблон презентации PowerPoint 2007",
+ "Excel 2007 spreadsheet" : "Таблица Excel 2007",
+ "Excel 2007 spreadsheet template" : "Шаблон таблицы Excel 2007",
+ "Word 2007 document" : "Документ Word 2007",
+ "Word 2007 document template" : "Шаблон документа Word 2007",
+ "Microsoft Visio document" : "Документ Microsoft Visio",
+ "WordPerfect document" : "Документ WordPerfect",
+ "7-zip archive" : "Архив 7-zip",
+ "Blender scene" : "Сцена Blender",
+ "Bzip2 archive" : "Архив Bzip2",
+ "Debian package" : "Пакет Debian",
+ "FictionBook document" : "Документ FictionBook",
+ "Unknown font" : "Неизвестный шрифт",
+ "Krita document" : "Документ Krita",
+ "Mobipocket e-book" : "Электронная книга Mobipocket",
+ "Windows Installer package" : "Пакет Windows Installer",
"Perl script" : "Сценарий Perl",
"PHP script" : "Сценарий PHP",
"Tar archive" : "Архив tar",
@@ -126,6 +154,11 @@ OC.L10N.register(
"MPEG-4 audio" : "Звуковой файл в формате MPEG-4",
"MP3 audio" : "Звуковой файл в формате MP3",
"Ogg audio" : "Звуковой файл в формате ogg",
+ "RIFF/WAVe standard Audio" : "Стандартное аудио RIFF/WAVe",
+ "WebM audio" : "Аудио WebM",
+ "MP3 ShoutCast playlist" : "Плейлист MP3 ShoutCast",
+ "Windows BMP image" : "Точечный рисунок Windows",
+ "Better Portable Graphics image" : "Изображение Better Portable Graphics",
"EMF image" : "Изображение в формате EMF",
"GIF image" : "Изображение в формате GIF",
"HEIC image" : "Изображение в формате HEIC",
@@ -145,6 +178,7 @@ OC.L10N.register(
"CSV document" : "Документ в формате CSV",
"HTML document" : "Документ в формате HTML",
"Markdown document" : "Документ в формате Markdown",
+ "Org-mode file" : "Файл Org-mode",
"Plain text document" : "Текстовый документ",
"Rich Text document" : "Документ в формате Rich Text",
"Electronic business card" : "Цифровая визитная карточка",
@@ -153,6 +187,7 @@ OC.L10N.register(
"NFO document" : "Файл описания в формате NFO",
"PHP source" : "Исходный код на языке PHP",
"Python script" : "Файл сценария на языке Python",
+ "ReStructuredText document" : "Документ ReStructuredText",
"3GPP multimedia file" : "Мультимедийный файл в формате 3GPP",
"MPEG video" : "Видеофайл в формате MPEG",
"DV video" : "Видеофайл в формате DV",
@@ -233,6 +268,7 @@ OC.L10N.register(
"Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!",
"Please contact your administrator." : "Обратитесь к своему администратору.",
"Session error" : "Ошибка сеанса",
+ "It appears your session token has expired, please refresh the page and try again." : "Похоже, токен вашей сессии истёк. Пожалуйста, обновите страницу и попробуйте снова.",
"An internal error occurred." : "Произошла внутренняя ошибка.",
"Please try again or contact your administrator." : "Попробуйте ещё раз или свяжитесь со своим администратором",
"Password" : "Пароль",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index bcf93985c6e..776bbe65cc6 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -42,6 +42,7 @@
"Task not found" : "Задача не найдена",
"Internal error" : "Внутренняя ошибка",
"Not found" : "Не найдено",
+ "Node is locked" : "Узел заблокирован",
"Bad request" : "Неверный запрос",
"Requested task type does not exist" : "Запрошенный тип задачи не существует",
"Necessary language model provider is not available" : "Необходимый поставщик языковой модели недоступен",
@@ -78,6 +79,7 @@
"%s (incompatible)" : "%s (несовместимое)",
"The following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
"Already up to date" : "Не нуждается в обновлении",
+ "Windows Command Script" : "Командный сценарий Windows",
"Electronic book document" : "Электронная книга",
"TrueType Font Collection" : "Набор шрифтов TrueType",
"Web Open Font Format" : "Файл шрифта в формате Open Font",
@@ -93,6 +95,8 @@
"Unknown" : "Неизвестно",
"PDF document" : "Документ в формате PDF",
"PostScript document" : "Документ в формате PostScript",
+ "RSS summary" : "RSS-сводка",
+ "Android package" : "Пакет Android",
"KML geographic data" : "Пространственные данные в формате MKL",
"KML geographic compressed data" : "Сжатые пространственные данные в формате KML",
"Lotus Word Pro document" : "Документ Lotus Word Pro",
@@ -112,6 +116,30 @@
"ODP presentation" : "Презентация в формате ODP",
"ODP presentation (Flat XML)" : "Презентация в формате ODP (простой XML)",
"ODP template" : "Шаблон ODP",
+ "ODS spreadsheet" : "Таблица ODS",
+ "ODS spreadsheet (Flat XML)" : "Таблица ODS (плоский XML)",
+ "ODS template" : "Шаблон ODS",
+ "ODT document" : "Документ ODT",
+ "ODT document (Flat XML)" : "Документ ODT (плоский XML)",
+ "ODT template" : "Шаблон ODT",
+ "PowerPoint 2007 presentation" : "Презентация PowerPoint 2007",
+ "PowerPoint 2007 show" : "Демонстрация PowerPoint 2007",
+ "PowerPoint 2007 presentation template" : "Шаблон презентации PowerPoint 2007",
+ "Excel 2007 spreadsheet" : "Таблица Excel 2007",
+ "Excel 2007 spreadsheet template" : "Шаблон таблицы Excel 2007",
+ "Word 2007 document" : "Документ Word 2007",
+ "Word 2007 document template" : "Шаблон документа Word 2007",
+ "Microsoft Visio document" : "Документ Microsoft Visio",
+ "WordPerfect document" : "Документ WordPerfect",
+ "7-zip archive" : "Архив 7-zip",
+ "Blender scene" : "Сцена Blender",
+ "Bzip2 archive" : "Архив Bzip2",
+ "Debian package" : "Пакет Debian",
+ "FictionBook document" : "Документ FictionBook",
+ "Unknown font" : "Неизвестный шрифт",
+ "Krita document" : "Документ Krita",
+ "Mobipocket e-book" : "Электронная книга Mobipocket",
+ "Windows Installer package" : "Пакет Windows Installer",
"Perl script" : "Сценарий Perl",
"PHP script" : "Сценарий PHP",
"Tar archive" : "Архив tar",
@@ -124,6 +152,11 @@
"MPEG-4 audio" : "Звуковой файл в формате MPEG-4",
"MP3 audio" : "Звуковой файл в формате MP3",
"Ogg audio" : "Звуковой файл в формате ogg",
+ "RIFF/WAVe standard Audio" : "Стандартное аудио RIFF/WAVe",
+ "WebM audio" : "Аудио WebM",
+ "MP3 ShoutCast playlist" : "Плейлист MP3 ShoutCast",
+ "Windows BMP image" : "Точечный рисунок Windows",
+ "Better Portable Graphics image" : "Изображение Better Portable Graphics",
"EMF image" : "Изображение в формате EMF",
"GIF image" : "Изображение в формате GIF",
"HEIC image" : "Изображение в формате HEIC",
@@ -143,6 +176,7 @@
"CSV document" : "Документ в формате CSV",
"HTML document" : "Документ в формате HTML",
"Markdown document" : "Документ в формате Markdown",
+ "Org-mode file" : "Файл Org-mode",
"Plain text document" : "Текстовый документ",
"Rich Text document" : "Документ в формате Rich Text",
"Electronic business card" : "Цифровая визитная карточка",
@@ -151,6 +185,7 @@
"NFO document" : "Файл описания в формате NFO",
"PHP source" : "Исходный код на языке PHP",
"Python script" : "Файл сценария на языке Python",
+ "ReStructuredText document" : "Документ ReStructuredText",
"3GPP multimedia file" : "Мультимедийный файл в формате 3GPP",
"MPEG video" : "Видеофайл в формате MPEG",
"DV video" : "Видеофайл в формате DV",
@@ -231,6 +266,7 @@
"Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!",
"Please contact your administrator." : "Обратитесь к своему администратору.",
"Session error" : "Ошибка сеанса",
+ "It appears your session token has expired, please refresh the page and try again." : "Похоже, токен вашей сессии истёк. Пожалуйста, обновите страницу и попробуйте снова.",
"An internal error occurred." : "Произошла внутренняя ошибка.",
"Please try again or contact your administrator." : "Попробуйте ещё раз или свяжитесь со своим администратором",
"Password" : "Пароль",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index b366a420aa3..085428af5a3 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -44,6 +44,7 @@ OC.L10N.register(
"Task not found" : "Задатак није пронађен",
"Internal error" : "Интерна грешка",
"Not found" : "Није нађено",
+ "Node is locked" : "Чвор је закључан.",
"Bad request" : "Неисправан захтев",
"Requested task type does not exist" : "Тражени тип задатка не постоји",
"Necessary language model provider is not available" : "Није доступан неопходни пружалац услуге језичког модела",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index 332ab65f844..6f60c34dfca 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -42,6 +42,7 @@
"Task not found" : "Задатак није пронађен",
"Internal error" : "Интерна грешка",
"Not found" : "Није нађено",
+ "Node is locked" : "Чвор је закључан.",
"Bad request" : "Неисправан захтев",
"Requested task type does not exist" : "Тражени тип задатка не постоји",
"Necessary language model provider is not available" : "Није доступан неопходни пружалац услуге језичког модела",
diff --git a/core/openapi-full.json b/core/openapi-full.json
index 298be2e59d8..5edb86992dc 100644
--- a/core/openapi-full.json
+++ b/core/openapi-full.json
@@ -1173,7 +1173,7 @@
],
"parameters": [
{
- "name": "USER_AGENT",
+ "name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@@ -8066,7 +8066,7 @@
],
"parameters": [
{
- "name": "USER_AGENT",
+ "name": "user-agent",
"in": "header",
"schema": {
"type": "string"
diff --git a/core/openapi.json b/core/openapi.json
index 7462890bb4b..5f9178202eb 100644
--- a/core/openapi.json
+++ b/core/openapi.json
@@ -1173,7 +1173,7 @@
],
"parameters": [
{
- "name": "USER_AGENT",
+ "name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@@ -8066,7 +8066,7 @@
],
"parameters": [
{
- "name": "USER_AGENT",
+ "name": "user-agent",
"in": "header",
"schema": {
"type": "string"
diff --git a/core/templates/403.php b/core/templates/403.php
index 17866e670af..dc34c8d854f 100644
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -14,9 +14,17 @@ if (!isset($_)) {//standalone page is not supported anymore - redirect to /
}
// @codeCoverageIgnoreEnd
?>
-<div class="guest-box">
+<div class="body-login-container update">
+ <div class="icon-big icon-password"></div>
<h2><?php p($l->t('Access forbidden')); ?></h2>
- <p class='hint'><?php if (isset($_['message'])) {
- p($_['message']);
- }?></p>
-</ul>
+ <p class="hint">
+ <?php if (isset($_['message'])): ?>
+ <?php p($_['message']); ?>
+ <?php else: ?>
+ <?php p($l->t('You are not allowed to access this page.')); ?>
+ <?php endif; ?>
+ </p>
+ <p><a class="button primary" href="<?php p(\OCP\Server::get(\OCP\IURLGenerator::class)->linkTo('', 'index.php')) ?>">
+ <?php p($l->t('Back to %s', [$theme->getName()])); ?>
+ </a></p>
+</div>