diff options
-rw-r--r-- | apps/dashboard/l10n/pt_BR.js | 2 | ||||
-rw-r--r-- | apps/dashboard/l10n/pt_BR.json | 2 | ||||
-rw-r--r-- | apps/dav/l10n/fr.js | 8 | ||||
-rw-r--r-- | apps/dav/l10n/fr.json | 8 | ||||
-rw-r--r-- | apps/files/l10n/ja.js | 2 | ||||
-rw-r--r-- | apps/files/l10n/ja.json | 2 | ||||
-rw-r--r-- | apps/settings/l10n/et_EE.js | 1 | ||||
-rw-r--r-- | apps/settings/l10n/et_EE.json | 1 | ||||
-rw-r--r-- | apps/theming/l10n/et_EE.js | 2 | ||||
-rw-r--r-- | apps/theming/l10n/et_EE.json | 2 | ||||
-rw-r--r-- | tests/lib/Comments/ManagerTest.php | 2 |
11 files changed, 26 insertions, 6 deletions
diff --git a/apps/dashboard/l10n/pt_BR.js b/apps/dashboard/l10n/pt_BR.js index df0ca910594..0843b517b11 100644 --- a/apps/dashboard/l10n/pt_BR.js +++ b/apps/dashboard/l10n/pt_BR.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Dashboard" : "Painel", "Dashboard app" : "Aplicativo Painel", - "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.", + "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos compromissos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.", "Weather" : "Clima", "Status" : "Status", "Good morning" : "Bom dia", diff --git a/apps/dashboard/l10n/pt_BR.json b/apps/dashboard/l10n/pt_BR.json index 3d02d95d5b8..4750d3b61a5 100644 --- a/apps/dashboard/l10n/pt_BR.json +++ b/apps/dashboard/l10n/pt_BR.json @@ -1,7 +1,7 @@ { "translations": { "Dashboard" : "Painel", "Dashboard app" : "Aplicativo Painel", - "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos agendamentos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.", + "Start your day informed\n\nThe Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! People can add the widgets they like and change the background to their liking." : "Comece o dia informado \n\nO Painel do Nextcloud (Nextcloud Dashboard) é o seu ponto de partida do dia, oferecendo uma visão geral de seus próximos compromissos, e-mails urgentes, mensagens de bate-papo, tickets recebidos, tweets mais recentes e muito mais! As pessoas podem adicionar os widgets que desejarem e alterar o plano de fundo de acordo com sua preferência.", "Weather" : "Clima", "Status" : "Status", "Good morning" : "Bom dia", diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js index 3a565fcc2d7..eca63f571f3 100644 --- a/apps/dav/l10n/fr.js +++ b/apps/dav/l10n/fr.js @@ -72,10 +72,15 @@ OC.L10N.register( "Description: %s" : "Description : %s", "Where: %s" : "Où : %s", "%1$s via %2$s" : "%1$s via %2$s", + "In the past on %1$s for the entire day" : "Dans le passé toute la journée du %1$s ", "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Dans une minute le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière"], "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Dans une heure le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière"], "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Dans un jour le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière"], "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Dans une semaine le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière"], + "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Dans un mois toute la journée du %1$s","Dans %n mois toute la journée du %1$s","Dans %n mois toute la journée du %1$s"], + "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Dans un an toute la journée du %1$s","Dans %n années toute la journée du %1$s","Dans %n années toute la journée du %1$s"], + "In the past on %1$s between %2$s - %3$s" : "Dans le passé le %1$s entre %2$s - %3$s", + "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Dans une minute le %1$s entre %2$s - %3$s","Dans %n minutes le %1$s entre %2$s - %3$s","Dans %n minutes le %1$s entre %2$s - %3$s"], "Could not generate when statement" : "Impossible de déterminer quand", "Every Day for the entire day" : "Chaque jour pour toute la journée", "Every Day for the entire day until %1$s" : "Chaque jour pour toute la journée jusqu'au %1$s", @@ -219,6 +224,9 @@ OC.L10N.register( "Completed on %s" : "Terminé le %s", "Due on %s by %s" : "Echéance le %s pour %s", "Due on %s" : "Echéance le %s", + "System Address Book" : "Carnet d'adresses du système", + "The system address book contains contact information for all users in your instance." : "Le carnet d'adresses du système contient les informations de contact de tous les utilisateurs de votre instance.", + "Enable System Address Book" : "Activer le carnet d'adresses du système", "DAV system address book" : "Carnet d'adresses système DAV", "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses système.", "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "La synchronisation du carnet d'adresses système DAV n'a pas encore été effectuée car votre instance a plus de 1 000 utilisateurs ou parce qu'une erreur est survenue. Merci de l'exécuter manuellement en tapant la commande \"occ dav:sync-system-addressbook\".", diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json index 3aeddd8de22..27e985861af 100644 --- a/apps/dav/l10n/fr.json +++ b/apps/dav/l10n/fr.json @@ -70,10 +70,15 @@ "Description: %s" : "Description : %s", "Where: %s" : "Où : %s", "%1$s via %2$s" : "%1$s via %2$s", + "In the past on %1$s for the entire day" : "Dans le passé toute la journée du %1$s ", "_In a minute on %1$s for the entire day_::_In %n minutes on %1$s for the entire day_" : ["Dans une minute le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière","Dans %n minutes le %1$s pour la journée entière"], "_In a hour on %1$s for the entire day_::_In %n hours on %1$s for the entire day_" : ["Dans une heure le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière","Dans %n heures le %1$s pour la journée entière"], "_In a day on %1$s for the entire day_::_In %n days on %1$s for the entire day_" : ["Dans un jour le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière","Dans %n jours le %1$s pour la journée entière"], "_In a week on %1$s for the entire day_::_In %n weeks on %1$s for the entire day_" : ["Dans une semaine le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière","Dans %n semaines le %1$s pour la journée entière"], + "_In a month on %1$s for the entire day_::_In %n months on %1$s for the entire day_" : ["Dans un mois toute la journée du %1$s","Dans %n mois toute la journée du %1$s","Dans %n mois toute la journée du %1$s"], + "_In a year on %1$s for the entire day_::_In %n years on %1$s for the entire day_" : ["Dans un an toute la journée du %1$s","Dans %n années toute la journée du %1$s","Dans %n années toute la journée du %1$s"], + "In the past on %1$s between %2$s - %3$s" : "Dans le passé le %1$s entre %2$s - %3$s", + "_In a minute on %1$s between %2$s - %3$s_::_In %n minutes on %1$s between %2$s - %3$s_" : ["Dans une minute le %1$s entre %2$s - %3$s","Dans %n minutes le %1$s entre %2$s - %3$s","Dans %n minutes le %1$s entre %2$s - %3$s"], "Could not generate when statement" : "Impossible de déterminer quand", "Every Day for the entire day" : "Chaque jour pour toute la journée", "Every Day for the entire day until %1$s" : "Chaque jour pour toute la journée jusqu'au %1$s", @@ -217,6 +222,9 @@ "Completed on %s" : "Terminé le %s", "Due on %s by %s" : "Echéance le %s pour %s", "Due on %s" : "Echéance le %s", + "System Address Book" : "Carnet d'adresses du système", + "The system address book contains contact information for all users in your instance." : "Le carnet d'adresses du système contient les informations de contact de tous les utilisateurs de votre instance.", + "Enable System Address Book" : "Activer le carnet d'adresses du système", "DAV system address book" : "Carnet d'adresses système DAV", "No outstanding DAV system address book sync." : "Pas de synchronisation DAV en cours du carnet d'adresses système.", "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "La synchronisation du carnet d'adresses système DAV n'a pas encore été effectuée car votre instance a plus de 1 000 utilisateurs ou parce qu'une erreur est survenue. Merci de l'exécuter manuellement en tapant la commande \"occ dav:sync-system-addressbook\".", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index 419badb5dee..6b29c1c9780 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -173,7 +173,7 @@ OC.L10N.register( "Error during upload: {message}" : "アップロード中にエラーが発生しました: {message}", "Error during upload, status code {status}" : "アップロード中のエラー、ステータスコード {status}", "Unknown error during upload" : "不明なエラーがアップロード中に発生しました", - "\"{displayName}\" action executed successfully" : "\"{displayName}\" アクションは正常に実行された", + "\"{displayName}\" action executed successfully" : "\"{displayName}\" アクションは正常に実行されました", "Loading current folder" : "現在のフォルダの読み込み中", "Retry" : "リトライ", "No files in here" : "ファイルがありません", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 5ac7df29c81..d8d803191db 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -171,7 +171,7 @@ "Error during upload: {message}" : "アップロード中にエラーが発生しました: {message}", "Error during upload, status code {status}" : "アップロード中のエラー、ステータスコード {status}", "Unknown error during upload" : "不明なエラーがアップロード中に発生しました", - "\"{displayName}\" action executed successfully" : "\"{displayName}\" アクションは正常に実行された", + "\"{displayName}\" action executed successfully" : "\"{displayName}\" アクションは正常に実行されました", "Loading current folder" : "現在のフォルダの読み込み中", "Retry" : "リトライ", "No files in here" : "ファイルがありません", diff --git a/apps/settings/l10n/et_EE.js b/apps/settings/l10n/et_EE.js index b7bd2029c26..4b06afedea8 100644 --- a/apps/settings/l10n/et_EE.js +++ b/apps/settings/l10n/et_EE.js @@ -205,6 +205,7 @@ OC.L10N.register( "Enforce expiration date" : "Sunnitud aegumise kuupäev", "Default expiration time of new shares in days" : "Uue jaosmeedia vaikimisi aegumine päevades", "Expire shares after x days" : "Jaosmeedia aegub x päeva möödudes", + "Privacy settings for sharing" : "Jagamise privaatsusseadistused", "This text will be shown on the public link upload page when the file list is hidden." : "Seda teksti näidatakse avaliku lingiga üleslaadimise lehel kui failide loend on peidetud.", "Two-Factor Authentication" : "Kaheastmeline autentimine", "Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Kaheastmelist autentimist on võimalik teha kohustuslikuks kas kõikidele kasutajakontodele või konkreetsete gruppide kaupa. Kui kaheastmelise autentimise kohustuslikkus on määratud, kuid on kasutajal seadistamata, siis ta ei saa siia serverisse sisse logida.", diff --git a/apps/settings/l10n/et_EE.json b/apps/settings/l10n/et_EE.json index cc1e10a6c85..02f14eb1312 100644 --- a/apps/settings/l10n/et_EE.json +++ b/apps/settings/l10n/et_EE.json @@ -203,6 +203,7 @@ "Enforce expiration date" : "Sunnitud aegumise kuupäev", "Default expiration time of new shares in days" : "Uue jaosmeedia vaikimisi aegumine päevades", "Expire shares after x days" : "Jaosmeedia aegub x päeva möödudes", + "Privacy settings for sharing" : "Jagamise privaatsusseadistused", "This text will be shown on the public link upload page when the file list is hidden." : "Seda teksti näidatakse avaliku lingiga üleslaadimise lehel kui failide loend on peidetud.", "Two-Factor Authentication" : "Kaheastmeline autentimine", "Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Kaheastmelist autentimist on võimalik teha kohustuslikuks kas kõikidele kasutajakontodele või konkreetsete gruppide kaupa. Kui kaheastmelise autentimise kohustuslikkus on määratud, kuid on kasutajal seadistamata, siis ta ei saa siia serverisse sisse logida.", diff --git a/apps/theming/l10n/et_EE.js b/apps/theming/l10n/et_EE.js index b1157c6daa8..8c9c4cf4a11 100644 --- a/apps/theming/l10n/et_EE.js +++ b/apps/theming/l10n/et_EE.js @@ -58,7 +58,7 @@ OC.L10N.register( "Primary color" : "Põhivärv", "The primary color is used for highlighting elements like important buttons. It might get slightly adjusted depending on the current color schema." : "Põhivärv on mõeldud lehe oluliste elementude rõhutamiseks. Vastavalt valitud üldkujundusele võib see värv ka natuke kohenduda.", "Legal notice link" : "Juriidilise teabe link", - "Privacy policy link" : "Privaatsusreeglite link", + "Privacy policy link" : "Privaatsustingimuste link", "Header logo" : "Päiselogo", "Upload new header logo" : "Laadi üles uus päiselogo", "Favicon" : "Saidi favikon", diff --git a/apps/theming/l10n/et_EE.json b/apps/theming/l10n/et_EE.json index ff9ab984af0..e790923b127 100644 --- a/apps/theming/l10n/et_EE.json +++ b/apps/theming/l10n/et_EE.json @@ -56,7 +56,7 @@ "Primary color" : "Põhivärv", "The primary color is used for highlighting elements like important buttons. It might get slightly adjusted depending on the current color schema." : "Põhivärv on mõeldud lehe oluliste elementude rõhutamiseks. Vastavalt valitud üldkujundusele võib see värv ka natuke kohenduda.", "Legal notice link" : "Juriidilise teabe link", - "Privacy policy link" : "Privaatsusreeglite link", + "Privacy policy link" : "Privaatsustingimuste link", "Header logo" : "Päiselogo", "Upload new header logo" : "Laadi üles uus päiselogo", "Favicon" : "Saidi favikon", diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index 760f504fc60..75536bec0c7 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -1099,6 +1099,7 @@ class ManagerTest extends TestCase { * @return IComment[] */ private function proccessComments(array $data): array { + $this->connection->beginTransaction(); /** @var IComment[] */ $comments = []; foreach ($data as $comment) { @@ -1114,6 +1115,7 @@ class ManagerTest extends TestCase { $comment = $this->testSave($message, $actorId, $verb, $parentId, $id); $comments[$comment->getMessage() . '#' . $comment->getActorId()] = $comment; } + $this->connection->commit(); return $comments; } |