diff options
| -rw-r--r-- | apps/provisioning_api/l10n/ro.js | 8 | ||||
| -rw-r--r-- | apps/provisioning_api/l10n/ro.json | 6 | ||||
| -rw-r--r-- | apps/settings/l10n/pl.js | 2 | ||||
| -rw-r--r-- | apps/settings/l10n/pl.json | 2 | ||||
| -rw-r--r-- | apps/settings/lib/Activity/GroupSetting.php | 2 | ||||
| -rw-r--r-- | lib/private/Preview/Generator.php | 1 | ||||
| -rw-r--r-- | lib/private/Preview/Movie.php | 9 | ||||
| -rw-r--r-- | version.php | 4 |
8 files changed, 27 insertions, 7 deletions
diff --git a/apps/provisioning_api/l10n/ro.js b/apps/provisioning_api/l10n/ro.js new file mode 100644 index 00000000000..27c147485f2 --- /dev/null +++ b/apps/provisioning_api/l10n/ro.js @@ -0,0 +1,8 @@ +OC.L10N.register( + "provisioning_api", + { + "Provisioning API" : "API de provizionare", + "This application enables a set of APIs that external systems can use to manage users, groups and apps." : "Această aplicație pornește un set de API-uri ce pot fi folosite de systemele externe pentru a gestiona utilizatori, grupuri și aplicații. ", + "This application enables a set of APIs that external systems can use to create, edit, delete and query user\n\t\tattributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users\n\t\tcan also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables\n\t\tan admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely.\n\t\tOnce the app is enabled, HTTP requests can be used via a Basic Auth header to perform any of the functions\n\t\tlisted above. More information is available in the Provisioning API documentation, including example calls\n\t\tand server responses." : "Această aplicație permite unui set de API-uri ce pot fi folosite de sustemele externe pentru a creea, edita, șterge și a interoga utilizatori\n\t\tatribute, interogare, setare și eliminare grupuri, setare cote și interogare stocare totală utilizată în Nextcloud. Utilizatorii grupului admin\n\t\tpot de asemenea iteroga Nextcloud și îndeplini aceleași funcții ca și grupul de admini pe care îi și gestionează. API-ul permite \n\t\tunui administrator să caute aplicații active Nextcloud, informații despre aplicații și informații legate de activarea sau dezactivarea unei aplicații de la distanță.\n\t\tOdată ce aplicația este activată, solicitările HTTP pot fi utilizate printr-un antet Basic Auth pentru a efectua oricare dintre funcțiile\n\t\tmenționate mai sus. Mai multe informații sunt prezente în documentatie de provizionare de API, inclusiv exemple de interogări\n\t\tși răspunsul primit de la server." +}, +"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/provisioning_api/l10n/ro.json b/apps/provisioning_api/l10n/ro.json new file mode 100644 index 00000000000..7fdcd734afb --- /dev/null +++ b/apps/provisioning_api/l10n/ro.json @@ -0,0 +1,6 @@ +{ "translations": { + "Provisioning API" : "API de provizionare", + "This application enables a set of APIs that external systems can use to manage users, groups and apps." : "Această aplicație pornește un set de API-uri ce pot fi folosite de systemele externe pentru a gestiona utilizatori, grupuri și aplicații. ", + "This application enables a set of APIs that external systems can use to create, edit, delete and query user\n\t\tattributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users\n\t\tcan also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables\n\t\tan admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely.\n\t\tOnce the app is enabled, HTTP requests can be used via a Basic Auth header to perform any of the functions\n\t\tlisted above. More information is available in the Provisioning API documentation, including example calls\n\t\tand server responses." : "Această aplicație permite unui set de API-uri ce pot fi folosite de sustemele externe pentru a creea, edita, șterge și a interoga utilizatori\n\t\tatribute, interogare, setare și eliminare grupuri, setare cote și interogare stocare totală utilizată în Nextcloud. Utilizatorii grupului admin\n\t\tpot de asemenea iteroga Nextcloud și îndeplini aceleași funcții ca și grupul de admini pe care îi și gestionează. API-ul permite \n\t\tunui administrator să caute aplicații active Nextcloud, informații despre aplicații și informații legate de activarea sau dezactivarea unei aplicații de la distanță.\n\t\tOdată ce aplicația este activată, solicitările HTTP pot fi utilizate printr-un antet Basic Auth pentru a efectua oricare dintre funcțiile\n\t\tmenționate mai sus. Mai multe informații sunt prezente în documentatie de provizionare de API, inclusiv exemple de interogări\n\t\tși răspunsul primit de la server." +},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" +}
\ No newline at end of file diff --git a/apps/settings/l10n/pl.js b/apps/settings/l10n/pl.js index 471fd30edf0..396d49afa9b 100644 --- a/apps/settings/l10n/pl.js +++ b/apps/settings/l10n/pl.js @@ -130,7 +130,7 @@ OC.L10N.register( "There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via \"occ security:certificates:import\" command. Their paths inside the data directory are shown below." : "Istnieją pewne certyfikaty SSL zaimportowane przez użytkownika, które nie są już używane z Nextcloud 21. Można je zaimportować z wiersza poleceń za pomocą polecenia \"occ security:certificates:import\". Ich ścieżki w katalogu danych są pokazane poniżej.", "The old server-side-encryption format is enabled. We recommend disabling this." : "Stary format szyfrowania po stronie serwera jest włączony. Zalecamy wyłączenie jego.", "MariaDB version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MariaDB 10.2 or higher." : "Używana jest MariaDB w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MariaDB 10.2 lub nowszej.", - "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Używana jest MySQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MySQL 8.0 lub MariaDB 10.2, lub nowszej.", + "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Używana jest MySQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MySQL 8.0 lub MariaDB 10.2, albo nowszej.", "PostgreSQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires PostgreSQL 9.6 or higher." : "Używana jest PostgreSQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwał tej wersji i wymagać będzie PostgreSQL 9.6 lub nowszego.", "Nextcloud settings" : "Ustawienia Nextcloud", "Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Uwierzytelnianie dwuskładnikowe może być wymuszane dla wszystkich użytkowników i określonych grup. Jeśli nie mają skonfigurowanego dostawcy logowania dwuskładnikowego, nie będą mogli zalogować się do systemu.", diff --git a/apps/settings/l10n/pl.json b/apps/settings/l10n/pl.json index b81bab68c80..b802217237f 100644 --- a/apps/settings/l10n/pl.json +++ b/apps/settings/l10n/pl.json @@ -128,7 +128,7 @@ "There are some user imported SSL certificates present, that are not used anymore with Nextcloud 21. They can be imported on the command line via \"occ security:certificates:import\" command. Their paths inside the data directory are shown below." : "Istnieją pewne certyfikaty SSL zaimportowane przez użytkownika, które nie są już używane z Nextcloud 21. Można je zaimportować z wiersza poleceń za pomocą polecenia \"occ security:certificates:import\". Ich ścieżki w katalogu danych są pokazane poniżej.", "The old server-side-encryption format is enabled. We recommend disabling this." : "Stary format szyfrowania po stronie serwera jest włączony. Zalecamy wyłączenie jego.", "MariaDB version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MariaDB 10.2 or higher." : "Używana jest MariaDB w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MariaDB 10.2 lub nowszej.", - "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Używana jest MySQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MySQL 8.0 lub MariaDB 10.2, lub nowszej.", + "MySQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher." : "Używana jest MySQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwać tej wersji i wymagać będzie MySQL 8.0 lub MariaDB 10.2, albo nowszej.", "PostgreSQL version \"%s\" is used. Nextcloud 21 will no longer support this version and requires PostgreSQL 9.6 or higher." : "Używana jest PostgreSQL w wersji \"%s\". Nextcloud 21 nie będzie już obsługiwał tej wersji i wymagać będzie PostgreSQL 9.6 lub nowszego.", "Nextcloud settings" : "Ustawienia Nextcloud", "Two-factor authentication can be enforced for all users and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Uwierzytelnianie dwuskładnikowe może być wymuszane dla wszystkich użytkowników i określonych grup. Jeśli nie mają skonfigurowanego dostawcy logowania dwuskładnikowego, nie będą mogli zalogować się do systemu.", diff --git a/apps/settings/lib/Activity/GroupSetting.php b/apps/settings/lib/Activity/GroupSetting.php index 9538a4e4ebd..adc7717bf4b 100644 --- a/apps/settings/lib/Activity/GroupSetting.php +++ b/apps/settings/lib/Activity/GroupSetting.php @@ -85,7 +85,7 @@ class GroupSetting implements ISetting { * @since 11.0.0 */ public function canChangeMail(): bool { - return false; + return true; } /** diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 454439a6f65..6e1e0997a68 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -224,6 +224,7 @@ class Generator { $previewProviders = $this->previewManager->getProviders(); foreach ($previewProviders as $supportedMimeType => $providers) { + // Filter out providers that does not support this mime if (!preg_match($supportedMimeType, $mimeType)) { continue; } diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 80f2b5eb763..e7fc7745996 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -31,6 +31,7 @@ namespace OC\Preview; use OCP\Files\File; use OCP\IImage; +use Psr\Log\LoggerInterface; class Movie extends ProviderV2 { public static $avconvBinary; @@ -78,13 +79,13 @@ class Movie extends ProviderV2 { $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) . ' -i ' . escapeshellarg($absPath) . ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) . - ' > /dev/null 2>&1'; + ' 2>&1'; } else { $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) . ' -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1' . ' ' . escapeshellarg($tmpPath) . - ' > /dev/null 2>&1'; + ' 2>&1'; } exec($cmd, $output, $returnCode); @@ -99,6 +100,10 @@ class Movie extends ProviderV2 { return $image; } } + + $logger = \OC::$server->get(LoggerInterface::class); + $logger->error('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]); + unlink($tmpPath); return null; } diff --git a/version.php b/version.php index 592a2f1f6ed..0f49bd02ffa 100644 --- a/version.php +++ b/version.php @@ -30,10 +30,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [22, 1, 0, 1]; +$OC_Version = [22, 1, 1, 0]; // The human readable string -$OC_VersionString = '22.1.0'; +$OC_VersionString = '22.1.1 RC1'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |