diff options
Diffstat (limited to 'core')
39 files changed, 222 insertions, 17 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index a0db77fd1f9..e78d274815d 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -281,8 +281,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $users = array(); $limit = 0; $offset = 0; - while ($count < 15 && count($users) == $limit) { - $limit = 15 - $count; + // limit defaults to 15 if not specified via request parameter and can be no larger than 500 + $request_limit = min((int)$_GET['limit'] ?: 15, 500); + while ($count < $request_limit && count($users) == $limit) { + $limit = $request_limit - $count; if ($shareWithinGroupOnly) { $users = OC_Group::displayNamesInGroups($usergroups, (string)$_GET['search'], $limit, $offset); } else { @@ -319,7 +321,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo continue; } - if ($count < 15) { + if ($count < $request_limit) { if (!isset($_GET['itemShares']) || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !is_array((string)$_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php index f8ded69e865..e6c0f5caa35 100644 --- a/core/command/db/converttype.php +++ b/core/command/db/converttype.php @@ -30,7 +30,6 @@ namespace OC\Core\Command\Db; use \OCP\IConfig; use OC\DB\Connection; use OC\DB\ConnectionFactory; - use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 7f5d943bb8b..85bd430db58 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -70,6 +70,12 @@ class Upgrade extends Command { null, InputOption::VALUE_NONE, 'only runs the database schema migration simulation, do not actually update' + ) + ->addOption( + '--no-app-disable', + null, + InputOption::VALUE_NONE, + 'skips the disable of third party apps' ); } @@ -83,6 +89,7 @@ class Upgrade extends Command { $simulateStepEnabled = true; $updateStepEnabled = true; + $skip3rdPartyAppsDisable = false; if ($input->getOption('skip-migration-test')) { $simulateStepEnabled = false; @@ -90,6 +97,9 @@ class Upgrade extends Command { if ($input->getOption('dry-run')) { $updateStepEnabled = false; } + if ($input->getOption('no-app-disable')) { + $skip3rdPartyAppsDisable = true; + } if (!$simulateStepEnabled && !$updateStepEnabled) { $output->writeln( @@ -106,6 +116,7 @@ class Upgrade extends Command { $updater->setSimulateStepEnabled($simulateStepEnabled); $updater->setUpdateStepEnabled($updateStepEnabled); + $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) { $output->writeln('<info>Turned on maintenance mode</info>'); @@ -127,7 +138,7 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) { $output->writeln('<info>Disabled incompatible app: ' . $app . '</info>'); }); - $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use($output) { + $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) { $output->writeln('<info>Disabled 3rd-party app: ' . $app . '</info>'); }); $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) { @@ -145,7 +156,6 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) { $output->writeln("<info>Updated <$app> to $version</info>"); }); - $updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) { $output->writeln("<error>$message</error>"); $self->upgradeFailed = true; diff --git a/core/css/styles.css b/core/css/styles.css index c8704066cf1..e019b874f61 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -40,6 +40,10 @@ body { height: 32px; display: none; } +#body-login .float-spinner { + margin-top: -32px; + padding-top: 32px; +} #nojavascript { position: fixed; @@ -638,6 +642,9 @@ label.infield { /* Database selector */ #body-login form #selectDbType { text-align:center; white-space: nowrap; } +#body-login form #selectDbType .info { + white-space: normal; +} #body-login form #selectDbType label { position:static; margin:0 -3px 5px; padding:.4em; font-size:12px; background:#f8f8f8; color:#888; cursor:pointer; @@ -1065,4 +1072,3 @@ fieldset.warning legend + p, fieldset.update legend + p { @-ms-viewport { width: device-width; } - diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 47cff780d2f..74bb9b1881d 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -59,7 +59,7 @@ // CSS rules this.css('color', '#fff'); - this.css('font-weight', 'bold'); + this.css('font-weight', 'normal'); this.css('text-align', 'center'); // calculate the height diff --git a/core/js/setup.js b/core/js/setup.js index 95237165b40..fd2547867ff 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -9,6 +9,8 @@ $(document).ready(function() { }; $('#selectDbType').buttonset(); + // change links inside an info box back to their default appearance + $('#selectDbType p.info a').button('destroy'); if($('#hasSQLite').val()){ $('#use_other_db').hide(); diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 9bb3face751..5d9f1863ef7 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -64,6 +64,11 @@ t('core', 'No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href="{docLink}">documentation</a>.', {docLink: data.memcacheDocs}) ); } + if(!data.isUrandomAvailable) { + messages.push( + t('core', '/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href="{docLink}">documentation</a>.', {docLink: data.securityDocs}) + ); + } } else { messages.push(t('core', 'Error occurred while checking server setup')); } diff --git a/core/js/share.js b/core/js/share.js index 121ee97d17f..415fe41ef5f 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -491,7 +491,7 @@ OC.Share={ $('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) { var $loading = $('#dropdown .shareWithLoading'); $loading.removeClass('hidden'); - $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term.trim(), itemShares: OC.Share.itemShares, itemType: itemType }, function(result) { + $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term.trim(), limit: 200, itemShares: OC.Share.itemShares, itemType: itemType }, function(result) { $loading.addClass('hidden'); if (result.status == 'success' && result.data.length > 0) { $( "#shareWith" ).autocomplete( "option", "autoFocus", true ); diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 3e6382603f5..65de3d0321d 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -66,7 +66,7 @@ describe('OC.SetupChecks tests', function() { { 'Content-Type': 'application/json' }, - JSON.stringify({serverHasInternetConnection: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance'}) + JSON.stringify({isUrandomAvailable: true, serverHasInternetConnection: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance'}) ); async.done(function( data, s, x ){ @@ -83,7 +83,7 @@ describe('OC.SetupChecks tests', function() { { 'Content-Type': 'application/json' }, - JSON.stringify({serverHasInternetConnection: false, dataDirectoryProtected: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance'}) + JSON.stringify({isUrandomAvailable: true, serverHasInternetConnection: false, dataDirectoryProtected: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance'}) ); async.done(function( data, s, x ){ @@ -100,7 +100,7 @@ describe('OC.SetupChecks tests', function() { { 'Content-Type': 'application/json', }, - JSON.stringify({serverHasInternetConnection: false, dataDirectoryProtected: false, isMemcacheConfigured: true}) + JSON.stringify({isUrandomAvailable: true, serverHasInternetConnection: false, dataDirectoryProtected: false, isMemcacheConfigured: true}) ); async.done(function( data, s, x ){ @@ -109,6 +109,22 @@ describe('OC.SetupChecks tests', function() { }); }); + it('should return an error if /dev/urandom is not accessible', function(done) { + var async = OC.SetupChecks.checkSetup(); + + suite.server.requests[0].respond( + 200, + { + 'Content-Type': 'application/json', + }, + JSON.stringify({isUrandomAvailable: false, securityDocs: 'https://docs.owncloud.org/myDocs.html', serverHasInternetConnection: true, dataDirectoryProtected: true, isMemcacheConfigured: true}) + ); + + async.done(function( data, s, x ){ + expect(data).toEqual(['/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href="https://docs.owncloud.org/myDocs.html">documentation</a>.']); + done(); + }); + }); it('should return an error if the response has no statuscode 200', function(done) { var async = OC.SetupChecks.checkSetup(); diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index c075351b9f5..33090bbda74 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -110,6 +110,86 @@ describe('OC.Share tests', function() { describe('Share with link', function() { // TODO: test ajax calls // TODO: test password field visibility (whenever enforced or not) + it('update password on focus out', function() { + $('#allowShareWithLink').val('yes'); + + OC.Share.showDropDown( + 'file', + 123, + $container, + true, + 31, + 'shared_file_name.txt' + ); + + // Toggle linkshare + $('#dropdown [name=linkCheckbox]').click(); + fakeServer.requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({data: {token: 'xyz'}, status: 'success'}) + ); + + // Enable password, enter password and focusout + $('#dropdown [name=showPassword]').click(); + $('#dropdown #linkPassText').focus(); + $('#dropdown #linkPassText').val('foo'); + $('#dropdown #linkPassText').focusout(); + + expect(fakeServer.requests[1].method).toEqual('POST'); + var body = OC.parseQueryString(fakeServer.requests[1].requestBody); + expect(body['shareWith']).toEqual('foo'); + + // Set password response + fakeServer.requests[1].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({data: {token: 'xyz'}, status: 'success'}) + ); + + expect($('#dropdown #linkPassText').val()).toEqual(''); + expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected'); + }); + it('update password on enter', function() { + $('#allowShareWithLink').val('yes'); + + OC.Share.showDropDown( + 'file', + 123, + $container, + true, + 31, + 'shared_file_name.txt' + ); + + // Toggle linkshare + $('#dropdown [name=linkCheckbox]').click(); + fakeServer.requests[0].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({data: {token: 'xyz'}, status: 'success'}) + ); + + // Enable password and enter password + $('#dropdown [name=showPassword]').click(); + $('#dropdown #linkPassText').focus(); + $('#dropdown #linkPassText').val('foo'); + $('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13})); + + expect(fakeServer.requests[1].method).toEqual('POST'); + var body = OC.parseQueryString(fakeServer.requests[1].requestBody); + expect(body['shareWith']).toEqual('foo'); + + // Set password response + fakeServer.requests[1].respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({data: {token: 'xyz'}, status: 'success'}) + ); + + expect($('#dropdown #linkPassText').val()).toEqual(''); + expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected'); + }); it('shows share with link checkbox when allowed', function() { $('#allowShareWithLink').val('yes'); OC.Share.showDropDown( diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 283f97c3be1..1df630bf26d 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Složka s daty", "Configure the database" : "Nastavit databázi", "Only %s is available." : "Pouze %s je dostupný.", + "Install and activate additional PHP modules to choose other database types." : "Pro výběr jiných typů databáze je třeba nainstalovat a povolit dodatečné PHP moduly.", + "For more details check out the documentation." : "Více informací lze nalézt v dokumentaci.", "Database user" : "Uživatel databáze", "Database password" : "Heslo databáze", "Database name" : "Název databáze", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index a2ff9f9dda1..616028fa31a 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -189,6 +189,8 @@ "Data folder" : "Složka s daty", "Configure the database" : "Nastavit databázi", "Only %s is available." : "Pouze %s je dostupný.", + "Install and activate additional PHP modules to choose other database types." : "Pro výběr jiných typů databáze je třeba nainstalovat a povolit dodatečné PHP moduly.", + "For more details check out the documentation." : "Více informací lze nalézt v dokumentaci.", "Database user" : "Uživatel databáze", "Database password" : "Heslo databáze", "Database name" : "Název databáze", diff --git a/core/l10n/de.js b/core/l10n/de.js index 4177a028cd4..2ded2a0a800 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installiere und aktiviere zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schau für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de.json b/core/l10n/de.json index 9959c62385c..651c5886cac 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -189,6 +189,8 @@ "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installiere und aktiviere zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schau für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 61cd7869768..5f97e1b90fe 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -190,7 +190,9 @@ OC.L10N.register( "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", - "Only %s is available." : "Es sind nur %s verfügbar.", + "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 86ec7e75b02..0c03c1bc241 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -188,7 +188,9 @@ "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", - "Only %s is available." : "Es sind nur %s verfügbar.", + "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/el.js b/core/l10n/el.js index 4c9cf8e018d..fe567209a33 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Φάκελος δεδομένων", "Configure the database" : "Ρύθμιση της βάσης δεδομένων", "Only %s is available." : "Μόνο %s είναι διαθέσιμο.", + "Install and activate additional PHP modules to choose other database types." : "Εγκαταστήστε και ενεργοποιείστε επιπλέον αρθρώματα PHP για να επιλέξετε άλλους τύπους βάσεων δεδομένων.", + "For more details check out the documentation." : "Για περισσότερες πληροφορίες ανατρέξτε στην τεκμηρίωση.", "Database user" : "Χρήστης της βάσης δεδομένων", "Database password" : "Συνθηματικό βάσης δεδομένων", "Database name" : "Όνομα βάσης δεδομένων", diff --git a/core/l10n/el.json b/core/l10n/el.json index 3cf513b2e9a..2c512da3f4a 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -189,6 +189,8 @@ "Data folder" : "Φάκελος δεδομένων", "Configure the database" : "Ρύθμιση της βάσης δεδομένων", "Only %s is available." : "Μόνο %s είναι διαθέσιμο.", + "Install and activate additional PHP modules to choose other database types." : "Εγκαταστήστε και ενεργοποιείστε επιπλέον αρθρώματα PHP για να επιλέξετε άλλους τύπους βάσεων δεδομένων.", + "For more details check out the documentation." : "Για περισσότερες πληροφορίες ανατρέξτε στην τεκμηρίωση.", "Database user" : "Χρήστης της βάσης δεδομένων", "Database password" : "Συνθηματικό βάσης δεδομένων", "Database name" : "Όνομα βάσης δεδομένων", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 910419fc498..4cb9072218d 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -134,6 +134,7 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], + "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. " : "The update was unsuccessful. ", @@ -190,6 +191,8 @@ OC.L10N.register( "Data folder" : "Data folder", "Configure the database" : "Configure the database", "Only %s is available." : "Only %s is available.", + "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.", + "For more details check out the documentation." : "For more details check out the documentation.", "Database user" : "Database user", "Database password" : "Database password", "Database name" : "Database name", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 6087dfcf4eb..011f700c87c 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -132,6 +132,7 @@ "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], + "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. " : "The update was unsuccessful. ", @@ -188,6 +189,8 @@ "Data folder" : "Data folder", "Configure the database" : "Configure the database", "Only %s is available." : "Only %s is available.", + "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.", + "For more details check out the documentation." : "For more details check out the documentation.", "Database user" : "Database user", "Database password" : "Database password", "Database name" : "Database name", diff --git a/core/l10n/es.js b/core/l10n/es.js index 0f6239bac2f..7d4e8319553 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", "Only %s is available." : "Solo %s está disponible.", + "Install and activate additional PHP modules to choose other database types." : "Instalar y activar módulos PHP adicionales para elegir otros formatos de base de datos.", + "For more details check out the documentation." : "Para más detalles revisar la documentación.", "Database user" : "Usuario de la base de datos", "Database password" : "Contraseña de la base de datos", "Database name" : "Nombre de la base de datos", diff --git a/core/l10n/es.json b/core/l10n/es.json index f978e29c713..c6acbfb8f1a 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -189,6 +189,8 @@ "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", "Only %s is available." : "Solo %s está disponible.", + "Install and activate additional PHP modules to choose other database types." : "Instalar y activar módulos PHP adicionales para elegir otros formatos de base de datos.", + "For more details check out the documentation." : "Para más detalles revisar la documentación.", "Database user" : "Usuario de la base de datos", "Database password" : "Contraseña de la base de datos", "Database name" : "Nombre de la base de datos", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 47edd9464bf..cffe48dbc43 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Datakansio", "Configure the database" : "Muokkaa tietokantaa", "Only %s is available." : "Vain %s on käytettävissä.", + "Install and activate additional PHP modules to choose other database types." : "Asenna ja aktivoi erillisiä PHP-moduuleja valitaksesi muita tietokantatyyppejä.", + "For more details check out the documentation." : "Lisätietoja on saatavilla dokumentaatiossa.", "Database user" : "Tietokannan käyttäjä", "Database password" : "Tietokannan salasana", "Database name" : "Tietokannan nimi", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 198bec2f9fb..58788a8421e 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -189,6 +189,8 @@ "Data folder" : "Datakansio", "Configure the database" : "Muokkaa tietokantaa", "Only %s is available." : "Vain %s on käytettävissä.", + "Install and activate additional PHP modules to choose other database types." : "Asenna ja aktivoi erillisiä PHP-moduuleja valitaksesi muita tietokantatyyppejä.", + "For more details check out the documentation." : "Lisätietoja on saatavilla dokumentaatiossa.", "Database user" : "Tietokannan käyttäjä", "Database password" : "Tietokannan salasana", "Database name" : "Tietokannan nimi", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 8f5bff70d4e..12e6ce8ea29 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Répertoire des données", "Configure the database" : "Configurer la base de données", "Only %s is available." : "%s seulement est disponible.", + "Install and activate additional PHP modules to choose other database types." : "Installez et activez les modules PHP additionnels pour choisir d'autres types de base de données.", + "For more details check out the documentation." : "Consultez la documentation pour des détails supplémentaires.", "Database user" : "Utilisateur de la base de données", "Database password" : "Mot de passe de la base de données", "Database name" : "Nom de la base de données", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 6e0e9f4aa18..7a46ccce15c 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -189,6 +189,8 @@ "Data folder" : "Répertoire des données", "Configure the database" : "Configurer la base de données", "Only %s is available." : "%s seulement est disponible.", + "Install and activate additional PHP modules to choose other database types." : "Installez et activez les modules PHP additionnels pour choisir d'autres types de base de données.", + "For more details check out the documentation." : "Consultez la documentation pour des détails supplémentaires.", "Database user" : "Utilisateur de la base de données", "Database password" : "Mot de passe de la base de données", "Database name" : "Nom de la base de données", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index 79119d32ce2..66fa87c9ad6 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Cartafol de datos", "Configure the database" : "Configurar a base de datos", "Only %s is available." : "Só está dispoñíbel %s.", + "Install and activate additional PHP modules to choose other database types." : "Instale e active os módulos de PHP adicionais para seleccionar outros tipos de bases de datos.", + "For more details check out the documentation." : "Para obter máis detalles revise a documentación.", "Database user" : "Usuario da base de datos", "Database password" : "Contrasinal da base de datos", "Database name" : "Nome da base de datos", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index c1d17291e45..e888d689551 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -189,6 +189,8 @@ "Data folder" : "Cartafol de datos", "Configure the database" : "Configurar a base de datos", "Only %s is available." : "Só está dispoñíbel %s.", + "Install and activate additional PHP modules to choose other database types." : "Instale e active os módulos de PHP adicionais para seleccionar outros tipos de bases de datos.", + "For more details check out the documentation." : "Para obter máis detalles revise a documentación.", "Database user" : "Usuario da base de datos", "Database password" : "Contrasinal da base de datos", "Database name" : "Nome da base de datos", diff --git a/core/l10n/it.js b/core/l10n/it.js index eba7161cbea..bcfc4950788 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Cartella dati", "Configure the database" : "Configura il database", "Only %s is available." : "È disponibile solo %s.", + "Install and activate additional PHP modules to choose other database types." : "Installa e attiva i moduli PHP aggiuntivi per scegliere gli altri tipi di database.", + "For more details check out the documentation." : "Per ulteriori dettagli, leggi la documentazione.", "Database user" : "Utente del database", "Database password" : "Password del database", "Database name" : "Nome del database", diff --git a/core/l10n/it.json b/core/l10n/it.json index 361bf4b0d28..430d893966e 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -189,6 +189,8 @@ "Data folder" : "Cartella dati", "Configure the database" : "Configura il database", "Only %s is available." : "È disponibile solo %s.", + "Install and activate additional PHP modules to choose other database types." : "Installa e attiva i moduli PHP aggiuntivi per scegliere gli altri tipi di database.", + "For more details check out the documentation." : "Per ulteriori dettagli, leggi la documentazione.", "Database user" : "Utente del database", "Database password" : "Password del database", "Database name" : "Nome del database", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index 707fd56605b..5b5465fb357 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -72,6 +72,7 @@ OC.L10N.register( "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i vår <a href=\"{docLink}\">documentasjon</a>.", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-header \"Strict-Transport-Security\" er ikke konfigurert til minst \"2,678,400\" sekunder. Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", @@ -85,6 +86,9 @@ OC.L10N.register( "Error while changing permissions" : "Feil ved endring av tillatelser", "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}", "Shared with you by {owner}" : "Delt med deg av {owner}", + "Share with users or groups …" : "Del med brukere eller grupper ...", + "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud", "Share link" : "Del lenke", "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages", "Link" : "Lenke", @@ -97,6 +101,7 @@ OC.L10N.register( "Set expiration date" : "Sett utløpsdato", "Expiration" : "Utløpsdato", "Expiration date" : "Utløpsdato", + "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "Adding user..." : "Legger til bruker...", "group" : "gruppe", "remote" : "ekstern", @@ -129,6 +134,7 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], + "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", "Please reload the page." : "Vennligst last siden på nytt.", "The update was unsuccessful. " : "Oppdateringen var mislykket.", @@ -176,6 +182,7 @@ OC.L10N.register( "File: %s" : "Fil: %s", "Line: %s" : "Linje: %s", "Trace" : "Trace", + "Security warning" : "Sikkerhetsadvarsel", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.", "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>", @@ -184,21 +191,28 @@ OC.L10N.register( "Data folder" : "Datamappe", "Configure the database" : "Konfigurer databasen", "Only %s is available." : "Kun %s er tilgjengelig.", + "Install and activate additional PHP modules to choose other database types." : "Installer og aktiver flere PHP-moduler for å velge andre databasetyper.", + "For more details check out the documentation." : "Sjekk dokumentasjonen for flere detaljer.", "Database user" : "Databasebruker", "Database password" : "Databasepassord", "Database name" : "Databasenavn", "Database tablespace" : "Database tabellområde", "Database host" : "Databasevert", + "Performance warning" : "Ytelsesadvarsel", "SQLite will be used as database." : "SQLite vil bli brukt som database.", "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering", "Finish setup" : "Fullfør oppsetting", "Finishing …" : "Ferdigstiller ...", + "Need help?" : "Trenger du hjelp?", + "See the documentation" : "Se documentasjonen", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.", "Log out" : "Logg ut", "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", + "An internal error occured." : "Det oppstod en intern feil.", + "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!", "remember" : "husk", "Log in" : "Logg inn", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index b53af891bbf..5bd8cf12a32 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -70,6 +70,7 @@ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Web-serveren din er ikke satt opp til å tillate synkronisering av filer ennå, fordi WebDAV-grensesnittet ikke ser ut til å virke.", "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.", + "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i vår <a href=\"{docLink}\">documentasjon</a>.", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "HTTP-header \"Strict-Transport-Security\" er ikke konfigurert til minst \"2,678,400\" sekunder. Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.", @@ -83,6 +84,9 @@ "Error while changing permissions" : "Feil ved endring av tillatelser", "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}", "Shared with you by {owner}" : "Delt med deg av {owner}", + "Share with users or groups …" : "Del med brukere eller grupper ...", + "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...", + "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud", "Share link" : "Del lenke", "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages", "Link" : "Lenke", @@ -95,6 +99,7 @@ "Set expiration date" : "Sett utløpsdato", "Expiration" : "Utløpsdato", "Expiration date" : "Utløpsdato", + "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "Adding user..." : "Legger til bruker...", "group" : "gruppe", "remote" : "ekstern", @@ -127,6 +132,7 @@ "Hello {name}, the weather is {weather}" : "Hallo {name}, været er {weather}", "Hello {name}" : "Hallo {name}", "_download %n file_::_download %n files_" : ["last ned %n fil","last ned %n filer"], + "{version} is available. Get more information on how to update." : "{version} er tilgjengelig. Få mer informasjon om å oppdatere.", "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", "Please reload the page." : "Vennligst last siden på nytt.", "The update was unsuccessful. " : "Oppdateringen var mislykket.", @@ -174,6 +180,7 @@ "File: %s" : "Fil: %s", "Line: %s" : "Linje: %s", "Trace" : "Trace", + "Security warning" : "Sikkerhetsadvarsel", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.", "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>", @@ -182,21 +189,28 @@ "Data folder" : "Datamappe", "Configure the database" : "Konfigurer databasen", "Only %s is available." : "Kun %s er tilgjengelig.", + "Install and activate additional PHP modules to choose other database types." : "Installer og aktiver flere PHP-moduler for å velge andre databasetyper.", + "For more details check out the documentation." : "Sjekk dokumentasjonen for flere detaljer.", "Database user" : "Databasebruker", "Database password" : "Databasepassord", "Database name" : "Databasenavn", "Database tablespace" : "Database tabellområde", "Database host" : "Databasevert", + "Performance warning" : "Ytelsesadvarsel", "SQLite will be used as database." : "SQLite vil bli brukt som database.", "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering", "Finish setup" : "Fullfør oppsetting", "Finishing …" : "Ferdigstiller ...", + "Need help?" : "Trenger du hjelp?", + "See the documentation" : "Se documentasjonen", "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.", "Log out" : "Logg ut", "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", + "An internal error occured." : "Det oppstod en intern feil.", + "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!", "remember" : "husk", "Log in" : "Logg inn", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 53cd4ce633f..7182ad3a1e9 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Gegevensmap", "Configure the database" : "Configureer de database", "Only %s is available." : "Alleen %s is beschikbaar.", + "Install and activate additional PHP modules to choose other database types." : "Installeer en activeer aanvullende PHP modules om andere soorten databases te kiezen.", + "For more details check out the documentation." : "Voor meer informatie wordt u verwezen naar de documentatie.", "Database user" : "Gebruiker database", "Database password" : "Wachtwoord database", "Database name" : "Naam database", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index ebc4cf4d3a2..ba0d7657c2a 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -189,6 +189,8 @@ "Data folder" : "Gegevensmap", "Configure the database" : "Configureer de database", "Only %s is available." : "Alleen %s is beschikbaar.", + "Install and activate additional PHP modules to choose other database types." : "Installeer en activeer aanvullende PHP modules om andere soorten databases te kiezen.", + "For more details check out the documentation." : "Voor meer informatie wordt u verwezen naar de documentatie.", "Database user" : "Gebruiker database", "Database password" : "Wachtwoord database", "Database name" : "Naam database", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 00dd9989021..b2b92bdf449 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -149,6 +149,7 @@ OC.L10N.register( "Reset password" : "Redefinir senha", "Searching other places" : "Pesquisando em outros lugares", "No search result in other places" : "Nenhum resultado da pesquisa em outros lugares", + "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultados da pesquisa em outros lugares","{count} resultados da pesquisa em outros lugares"], "Personal" : "Pessoal", "Users" : "Usuários", "Apps" : "Aplicações", @@ -190,6 +191,8 @@ OC.L10N.register( "Data folder" : "Pasta de dados", "Configure the database" : "Configurar o banco de dados", "Only %s is available." : "Somente %s está disponível.", + "Install and activate additional PHP modules to choose other database types." : "Instalar e ativar os módulos adicionais do PHP para escolher outros tipos de banco de dados.", + "For more details check out the documentation." : "Para mais informações consulte a documentação.", "Database user" : "Usuário do banco de dados", "Database password" : "Senha do banco de dados", "Database name" : "Nome do banco de dados", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 6991f703840..f8de63cde27 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -147,6 +147,7 @@ "Reset password" : "Redefinir senha", "Searching other places" : "Pesquisando em outros lugares", "No search result in other places" : "Nenhum resultado da pesquisa em outros lugares", + "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultados da pesquisa em outros lugares","{count} resultados da pesquisa em outros lugares"], "Personal" : "Pessoal", "Users" : "Usuários", "Apps" : "Aplicações", @@ -188,6 +189,8 @@ "Data folder" : "Pasta de dados", "Configure the database" : "Configurar o banco de dados", "Only %s is available." : "Somente %s está disponível.", + "Install and activate additional PHP modules to choose other database types." : "Instalar e ativar os módulos adicionais do PHP para escolher outros tipos de banco de dados.", + "For more details check out the documentation." : "Para mais informações consulte a documentação.", "Database user" : "Usuário do banco de dados", "Database password" : "Senha do banco de dados", "Database name" : "Nome do banco de dados", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 6a0da0710c9..cb11b5809bb 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -218,7 +218,7 @@ OC.L10N.register( "The theme %s has been disabled." : "%s 主题已被禁用。", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。", "Start update" : "开始更新", - "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：", + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为进行避免较大的安装时超时，你可以在你的安装目录下运行下面的命令：", "This %s instance is currently in maintenance mode, which may take a while." : "该 %s 实例当前处于维护模式，这将进行一些时间。", "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。" }, diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index a6d48105721..3321f61c072 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -216,7 +216,7 @@ "The theme %s has been disabled." : "%s 主题已被禁用。", "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。", "Start update" : "开始更新", - "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：", + "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为进行避免较大的安装时超时，你可以在你的安装目录下运行下面的命令：", "This %s instance is currently in maintenance mode, which may take a while." : "该 %s 实例当前处于维护模式，这将进行一些时间。", "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/core/templates/installation.php b/core/templates/installation.php index 911bc05069f..b686a1ca68c 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -85,7 +85,12 @@ script('core', [ <div id="selectDbType"> <?php foreach($_['databases'] as $type => $label): ?> <?php if(count($_['databases']) === 1): ?> - <p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p> + <p class="info"> + <?php p($l->t( 'Only %s is available.', array($label) )); ?> + <?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br> + <a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank"> + <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> + </p> <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> <?php else: ?> <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" |