Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Gieling <github@dartcafe.de>2022-09-18 13:27:59 +0300
committerGitHub <noreply@github.com>2022-09-18 13:27:59 +0300
commit2f8de4ef3f819571a724e5dbde1bfcead27cdce3 (patch)
treeb66eaf77be2223bb1a21f8fda1b5c8d946095688
parentbfd74b201bc06c6cdd80dba036a344c2c4ad5c6a (diff)
parent158e53ebfe9eafbd11c55508d03972c600859215 (diff)
Merge branch 'master' into dep/vue-nextcloud-6
Signed-off-by: René Gieling <github@dartcafe.de>
-rw-r--r--.github/workflows/publish_release.yml57
-rw-r--r--CHANGELOG.md13
-rw-r--r--l10n/bg.js2
-rw-r--r--l10n/bg.json2
-rw-r--r--l10n/cs.js4
-rw-r--r--l10n/cs.json4
-rw-r--r--l10n/de.js18
-rw-r--r--l10n/de.json18
-rw-r--r--l10n/de_DE.js2
-rw-r--r--l10n/de_DE.json2
-rw-r--r--l10n/el.js1
-rw-r--r--l10n/el.json1
-rw-r--r--l10n/es.js1
-rw-r--r--l10n/es.json1
-rw-r--r--l10n/eu.js1
-rw-r--r--l10n/eu.json1
-rw-r--r--l10n/fi.js1
-rw-r--r--l10n/fi.json1
-rw-r--r--l10n/fr.js24
-rw-r--r--l10n/fr.json24
-rw-r--r--l10n/hu.js1
-rw-r--r--l10n/hu.json1
-rw-r--r--l10n/lt_LT.js19
-rw-r--r--l10n/lt_LT.json19
-rw-r--r--l10n/pl.js2
-rw-r--r--l10n/pl.json2
-rw-r--r--l10n/pt_BR.js1
-rw-r--r--l10n/pt_BR.json1
-rw-r--r--l10n/sl.js1
-rw-r--r--l10n/sl.json1
-rw-r--r--l10n/tr.js2
-rw-r--r--l10n/tr.json2
-rw-r--r--l10n/uk.js1
-rw-r--r--l10n/uk.json1
-rw-r--r--l10n/zh_HK.js2
-rw-r--r--l10n/zh_HK.json2
-rw-r--r--l10n/zh_TW.js2
-rw-r--r--l10n/zh_TW.json2
-rw-r--r--package-lock.json14
-rw-r--r--package.json2
-rw-r--r--src/js/Exceptions/Exceptions.js11
-rw-r--r--src/js/mixins/watchPolls.js96
42 files changed, 260 insertions, 103 deletions
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
new file mode 100644
index 00000000..90a69bdd
--- /dev/null
+++ b/.github/workflows/publish_release.yml
@@ -0,0 +1,57 @@
+name: Draft Release
+
+on:
+ push:
+ tags:
+ - v*
+ - '!v*-'
+
+jobs:
+ checkout:
+ runs-on: ubuntu-latest
+ name: Release
+ steps:
+ - uses: actions/checkout@v2
+ - name: Check correct app version
+ id: appinfo
+ uses: ./.github/actions/get-polls-version
+
+ - name: Setup node
+ if: success()
+ uses: ./.github/actions/setup-node
+
+ - name: Setup composer and PHP
+ if: success()
+ uses: ./.github/actions/setup-composer
+ with:
+ mode: production
+ php-tools: composer
+
+ - name: build
+ run: npm run build --if-present
+
+ - name: Make appstore package
+ if: success()
+ run: make package
+
+ - name: rename package
+ if: success()
+ run: mv build/artifacts/appstore/polls.tar.gz build/artifacts/appstore/polls-${{ steps.appinfo.outputs.app-version }}.tar.gz
+
+ - name: create zip archive from sources
+ if: success()
+ run: |
+ pushd build/source
+ zip -r ../artifacts/appstore/polls-${{ steps.appinfo.outputs.app-version }}.zip *
+ popd
+
+ - name: Draft Release
+ if: success()
+ uses: softprops/action-gh-release@v1
+ with:
+ prerelease: false
+ draft: true
+ generate_release_notes: true
+ files: |
+ build/artifacts/appstore/polls-${{ steps.appinfo.outputs.app-version }}.tar.gz
+ build/artifacts/appstore/polls-${{ steps.appinfo.outputs.app-version }}.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ae20fb..5bc665d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,19 @@
# Changelog
All notable changes to this project will be documented in this file.
-## [3.8.0] - tbd
+## [4.0.0] - tbd
### New
- Support Nextcloud version 25
-- Minimum Nextcloud version 22
+### Misc
+- Experimental designs have been removed
+
+## [3.8.0] - 2022-09-18
+### New
+- Support Nextcloud version 22 - 24
- Convert links in comments to clickable links
-- Add an option for public users to logout from a poll, when logged in via cookie
+- Allow public users to logout from a poll, when logged in via cookie
+- Allow public users to change their name after registration to a public poll
- Allow bulk poll ownership transfer for admins
-- Allow users to change their name after registration to a public poll
- Added option to send mails about confirmed options
### Fix
diff --git a/l10n/bg.js b/l10n/bg.js
index f15d7de2..62f4a59a 100644
--- a/l10n/bg.js
+++ b/l10n/bg.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Комбинирайте няколко анкети за дати в един изглед",
"Add new Poll" : "Добавяне на нова анкета",
"Combine polls" : "Комбиниране на анкети",
- "Personal settings" : "Лични настройки",
+ "Polls settings" : "Настройки на анкети",
"Error loading poll list" : "Грешка при зареждането на списъка с анкети",
"Error cloning poll." : "Грешка при клониране на анкета.",
"404 - poll not found" : "404 - анкетата не е намерена",
diff --git a/l10n/bg.json b/l10n/bg.json
index d832ba70..f26d166f 100644
--- a/l10n/bg.json
+++ b/l10n/bg.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Комбинирайте няколко анкети за дати в един изглед",
"Add new Poll" : "Добавяне на нова анкета",
"Combine polls" : "Комбиниране на анкети",
- "Personal settings" : "Лични настройки",
+ "Polls settings" : "Настройки на анкети",
"Error loading poll list" : "Грешка при зареждането на списъка с анкети",
"Error cloning poll." : "Грешка при клониране на анкета.",
"404 - poll not found" : "404 - анкетата не е намерена",
diff --git a/l10n/cs.js b/l10n/cs.js
index 90518320..4750da2d 100644
--- a/l10n/cs.js
+++ b/l10n/cs.js
@@ -37,7 +37,7 @@ OC.L10N.register(
"%s created the poll." : "%s vytvořil(a) anketu.",
"A voting option has been unconfirmed." : "Potvrzení možnosti v hlasování bylo odvoláno.",
"%s has left a comment." : "%s zanechal(a) komentář.",
- "Reminder for poll \"%s\"" : "Připomínka pro anketu „%s",
+ "Reminder for poll \"%s\"" : "Připomínka pro anketu „%s“",
"Check your votes" : "Zkontrolovat své hlasy",
"The first poll option is away less than {leftPeriod} hours ({dateTime}, {timezone})." : "První možnost ankety je vždy nižší než {leftPeriod} hodin ({dateTime}, {timezone}).",
"The poll is about to expire in less than {leftPeriod} hours ({dateTime}, {timezone})." : "Platnost ankety skončí za méně než {leftPeriod} hodin ({dateTime}, {timezone}).",
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Zkombinovat vícero anket ohledně data do jednoho zobrazení",
"Add new Poll" : "Přidat novou anketu",
"Combine polls" : "Zkombinovat anketu",
- "Personal settings" : "Osobní nastavení",
+ "Polls settings" : "Nastavení pro ankety",
"Error loading poll list" : "Chyba při načítání seznamu anket",
"Error cloning poll." : "Chyba při klonování ankety.",
"404 - poll not found" : "404 – anketa nenalezena",
diff --git a/l10n/cs.json b/l10n/cs.json
index 6cecbe86..d40c8540 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -35,7 +35,7 @@
"%s created the poll." : "%s vytvořil(a) anketu.",
"A voting option has been unconfirmed." : "Potvrzení možnosti v hlasování bylo odvoláno.",
"%s has left a comment." : "%s zanechal(a) komentář.",
- "Reminder for poll \"%s\"" : "Připomínka pro anketu „%s",
+ "Reminder for poll \"%s\"" : "Připomínka pro anketu „%s“",
"Check your votes" : "Zkontrolovat své hlasy",
"The first poll option is away less than {leftPeriod} hours ({dateTime}, {timezone})." : "První možnost ankety je vždy nižší než {leftPeriod} hodin ({dateTime}, {timezone}).",
"The poll is about to expire in less than {leftPeriod} hours ({dateTime}, {timezone})." : "Platnost ankety skončí za méně než {leftPeriod} hodin ({dateTime}, {timezone}).",
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Zkombinovat vícero anket ohledně data do jednoho zobrazení",
"Add new Poll" : "Přidat novou anketu",
"Combine polls" : "Zkombinovat anketu",
- "Personal settings" : "Osobní nastavení",
+ "Polls settings" : "Nastavení pro ankety",
"Error loading poll list" : "Chyba při načítání seznamu anket",
"Error cloning poll." : "Chyba při klonování ankety.",
"404 - poll not found" : "404 – anketa nenalezena",
diff --git a/l10n/de.js b/l10n/de.js
index d3ec53c8..5b3cbbee 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -9,7 +9,7 @@ OC.L10N.register(
"This email is sent to you to inform you about the result of a poll you participated in. At least your name or your email address was recorded in this poll. If you want to be removed from this poll, contact the site administrator or the poll initiator, where the mail is sent from." : "Diese E-Mail wird dir zugesandt, um dich über das Ergebnis einer Umfrage zu informieren, an der du teilgenommen hast. Bei dieser Umfrage wird zumindest dein Name oder deine E-Mail-Adresse erfasst. Wenn du von dieser Umfrage entfernt werden möchtest, wende dich an den Site-Administrator oder den Initiator dieser Umfrage, von dem die E-Mail gesendet wird.",
"{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} möchte dich über das Endergebnis der Umfrage \"{title}\" informieren.",
"_Confirmed option:_::_Confirmed options:_" : ["Bestätigte Option:","Bestätigte Optionen:"],
- "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Die verwendete Zeitzone ist \"%s\", basierend auf der erkannten Zeitzone zum Zeitpunkt deiner Registrierung. Um die Zeiten in deiner aktuellen Zeitzone anzuzeigen, nehme an der Umfrage teil, indem du auf die Schaltfläche unten klickst.",
+ "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Die verwendete Zeitzone ist \"%s\", basierend auf der erkannten Zeitzone zum Zeitpunkt deiner Registrierung. Um die Zeiten in deiner aktuellen Zeitzone anzuzeigen, öffne die Umfrage, indem du auf die Schaltfläche unten klickst.",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Über diesen Link erhältst du persönlichen Zugriff auf die oben genannte Umfrage. Klicke auf die Schaltfläche oben oder kopiere den folgenden Link und füge ihn in die Adressleiste deines Browsers ein:",
"Do not share this link with other people, because it is connected to your votes." : "Teile diesen Link nicht mit anderen Personen, da er mit deinen Stimmabgaben verbunden ist.",
"Poll invitation \"%s\"" : "Umfrage-Einladung \"%s\"",
@@ -184,7 +184,7 @@ OC.L10N.register(
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Lösche in {countdown} Sekunde","Lösche in {countdown} Sekunden"],
"Send confirmation emails" : "Sende Bestätigungs-E-Mails",
"Sent emails to:" : "Sende E-Mails an:",
- "Emails could not be sent:" : "E-Mails konnten nicht versandt werden:",
+ "Emails could not be sent:" : "E-Mails konnten nicht gesendet werden:",
"Send information about confirmed options by email" : "Informationen über bestätigte Optionen per E-Mail senden",
"Inform your participants about the confirmed options" : "Informiere deine Teilnehmer über die bestätigten Optionen",
"Confirmations processed" : "Bestätigungen verarbeitet",
@@ -380,7 +380,7 @@ OC.L10N.register(
"Use calendar lookup for conflicting calendar events" : "Für Konflikte bei Terminen Suche im Kalender verwenden",
"Select the calendars to use for lookup." : "Kalender, in dem gesucht werden soll, auswählen",
"Specify in which period (in hours) before the option existing appointments should be included in the search results." : "Gib an, in welchem Zeitraum (in Stunden) vor der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
- "Specify in which period (in hours) after the option existing appointments should be included in the search results." : "Giben an, in welchem Zeitraum (in Stunden) nach der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
+ "Specify in which period (in hours) after the option existing appointments should be included in the search results." : "Gib an, in welchem Zeitraum (in Stunden) nach der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
"Text polls default to list view" : "Standardmäßig Textumfragen als Listenansicht",
"Check this, if you prefer to display text poll in a vertical aligned list rather than in the grid view. The initial default is list view." : "Aktiviere diese Option, wenn du Textabfragen lieber in einer vertikal ausgerichteten Liste als in der Rasteransicht anzeigen möchtest. Die anfängliche Standardeinstellung ist die Listenansicht.",
"Date polls default to list view" : "Standardmäßig Datumsumfragen als Listenansicht",
@@ -408,7 +408,7 @@ OC.L10N.register(
"Shares" : "Freigaben",
"Has voted" : "Hat teilgenommen",
"Has not voted" : "Hat nicht teilgenommen",
- "Resend invitation mail" : "Einladungs-E-Mail erneut versenden",
+ "Resend invitation mail" : "Einladungs-E-Mail erneut senden",
"Send invitation mail" : "Einladungs-E-Mail senden",
"Grant poll admin access" : "Gewähre Umfrage-Administratorrecht",
"Withdraw poll admin access" : "Entziehe das Umfrage-Administratorrecht",
@@ -464,10 +464,10 @@ OC.L10N.register(
"Valid name." : "Gültiger Name",
"Email address {emailAddress} saved." : "E-Mail-Adresse {emailAddress} wurde gespeichert.",
"Error saving email address {emailAddress}" : "Fehler beim Speichern der E-Mail-Adresse {emailAddress}",
- "Name changed." : "Name geändert ",
- "Error changing name." : "Fehler beim Ändern des Namens",
- "Invitation resent to {emailAddress}" : "Einladung erneut versendet an {emailAddress}",
- "Mail could not be resent to {emailAddress}" : "Einladung konnte nicht erneut an {emailAddress} versendet werden",
+ "Name changed." : "Name geändert.",
+ "Error changing name." : "Fehler beim Ändern des Namens.",
+ "Invitation resent to {emailAddress}" : "Einladung erneut an {emailAddress} gesendet",
+ "Mail could not be resent to {emailAddress}" : "Einladung konnte nicht erneut an {emailAddress} gesendet werden",
"Your votes are reset" : "Deine Stimmabgaben werden zurückgesetzt",
"Error while resetting votes" : "Fehler beim Zurücksetzen der Stimmabgaben",
"Type to add an individual share" : "Tippen, um eine einzelne Freigabe hinzuzufügen",
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Kombinieren Sie mehrere Datumsumfragen in einer einzigen Ansicht",
"Add new Poll" : "Neue Umfrage hinzufügen",
"Combine polls" : "Umfragen kombinieren",
- "Personal settings" : "Persönliche Einstellungen",
+ "Polls settings" : "Umfragen-Einstellungen",
"Error loading poll list" : "Fehler beim Laden der Umfrageliste",
"Error cloning poll." : "Fehler beim Klonen der Umfrage.",
"404 - poll not found" : "404 - Umfrage nicht gefunden",
diff --git a/l10n/de.json b/l10n/de.json
index ba2ae77a..6145c95e 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -7,7 +7,7 @@
"This email is sent to you to inform you about the result of a poll you participated in. At least your name or your email address was recorded in this poll. If you want to be removed from this poll, contact the site administrator or the poll initiator, where the mail is sent from." : "Diese E-Mail wird dir zugesandt, um dich über das Ergebnis einer Umfrage zu informieren, an der du teilgenommen hast. Bei dieser Umfrage wird zumindest dein Name oder deine E-Mail-Adresse erfasst. Wenn du von dieser Umfrage entfernt werden möchtest, wende dich an den Site-Administrator oder den Initiator dieser Umfrage, von dem die E-Mail gesendet wird.",
"{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} möchte dich über das Endergebnis der Umfrage \"{title}\" informieren.",
"_Confirmed option:_::_Confirmed options:_" : ["Bestätigte Option:","Bestätigte Optionen:"],
- "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Die verwendete Zeitzone ist \"%s\", basierend auf der erkannten Zeitzone zum Zeitpunkt deiner Registrierung. Um die Zeiten in deiner aktuellen Zeitzone anzuzeigen, nehme an der Umfrage teil, indem du auf die Schaltfläche unten klickst.",
+ "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Die verwendete Zeitzone ist \"%s\", basierend auf der erkannten Zeitzone zum Zeitpunkt deiner Registrierung. Um die Zeiten in deiner aktuellen Zeitzone anzuzeigen, öffne die Umfrage, indem du auf die Schaltfläche unten klickst.",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Über diesen Link erhältst du persönlichen Zugriff auf die oben genannte Umfrage. Klicke auf die Schaltfläche oben oder kopiere den folgenden Link und füge ihn in die Adressleiste deines Browsers ein:",
"Do not share this link with other people, because it is connected to your votes." : "Teile diesen Link nicht mit anderen Personen, da er mit deinen Stimmabgaben verbunden ist.",
"Poll invitation \"%s\"" : "Umfrage-Einladung \"%s\"",
@@ -182,7 +182,7 @@
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Lösche in {countdown} Sekunde","Lösche in {countdown} Sekunden"],
"Send confirmation emails" : "Sende Bestätigungs-E-Mails",
"Sent emails to:" : "Sende E-Mails an:",
- "Emails could not be sent:" : "E-Mails konnten nicht versandt werden:",
+ "Emails could not be sent:" : "E-Mails konnten nicht gesendet werden:",
"Send information about confirmed options by email" : "Informationen über bestätigte Optionen per E-Mail senden",
"Inform your participants about the confirmed options" : "Informiere deine Teilnehmer über die bestätigten Optionen",
"Confirmations processed" : "Bestätigungen verarbeitet",
@@ -378,7 +378,7 @@
"Use calendar lookup for conflicting calendar events" : "Für Konflikte bei Terminen Suche im Kalender verwenden",
"Select the calendars to use for lookup." : "Kalender, in dem gesucht werden soll, auswählen",
"Specify in which period (in hours) before the option existing appointments should be included in the search results." : "Gib an, in welchem Zeitraum (in Stunden) vor der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
- "Specify in which period (in hours) after the option existing appointments should be included in the search results." : "Giben an, in welchem Zeitraum (in Stunden) nach der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
+ "Specify in which period (in hours) after the option existing appointments should be included in the search results." : "Gib an, in welchem Zeitraum (in Stunden) nach der Option vorhandene Termine in die Suchergebnisse aufgenommen werden sollen",
"Text polls default to list view" : "Standardmäßig Textumfragen als Listenansicht",
"Check this, if you prefer to display text poll in a vertical aligned list rather than in the grid view. The initial default is list view." : "Aktiviere diese Option, wenn du Textabfragen lieber in einer vertikal ausgerichteten Liste als in der Rasteransicht anzeigen möchtest. Die anfängliche Standardeinstellung ist die Listenansicht.",
"Date polls default to list view" : "Standardmäßig Datumsumfragen als Listenansicht",
@@ -406,7 +406,7 @@
"Shares" : "Freigaben",
"Has voted" : "Hat teilgenommen",
"Has not voted" : "Hat nicht teilgenommen",
- "Resend invitation mail" : "Einladungs-E-Mail erneut versenden",
+ "Resend invitation mail" : "Einladungs-E-Mail erneut senden",
"Send invitation mail" : "Einladungs-E-Mail senden",
"Grant poll admin access" : "Gewähre Umfrage-Administratorrecht",
"Withdraw poll admin access" : "Entziehe das Umfrage-Administratorrecht",
@@ -462,10 +462,10 @@
"Valid name." : "Gültiger Name",
"Email address {emailAddress} saved." : "E-Mail-Adresse {emailAddress} wurde gespeichert.",
"Error saving email address {emailAddress}" : "Fehler beim Speichern der E-Mail-Adresse {emailAddress}",
- "Name changed." : "Name geändert ",
- "Error changing name." : "Fehler beim Ändern des Namens",
- "Invitation resent to {emailAddress}" : "Einladung erneut versendet an {emailAddress}",
- "Mail could not be resent to {emailAddress}" : "Einladung konnte nicht erneut an {emailAddress} versendet werden",
+ "Name changed." : "Name geändert.",
+ "Error changing name." : "Fehler beim Ändern des Namens.",
+ "Invitation resent to {emailAddress}" : "Einladung erneut an {emailAddress} gesendet",
+ "Mail could not be resent to {emailAddress}" : "Einladung konnte nicht erneut an {emailAddress} gesendet werden",
"Your votes are reset" : "Deine Stimmabgaben werden zurückgesetzt",
"Error while resetting votes" : "Fehler beim Zurücksetzen der Stimmabgaben",
"Type to add an individual share" : "Tippen, um eine einzelne Freigabe hinzuzufügen",
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Kombinieren Sie mehrere Datumsumfragen in einer einzigen Ansicht",
"Add new Poll" : "Neue Umfrage hinzufügen",
"Combine polls" : "Umfragen kombinieren",
- "Personal settings" : "Persönliche Einstellungen",
+ "Polls settings" : "Umfragen-Einstellungen",
"Error loading poll list" : "Fehler beim Laden der Umfrageliste",
"Error cloning poll." : "Fehler beim Klonen der Umfrage.",
"404 - poll not found" : "404 - Umfrage nicht gefunden",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 668013b6..4407ed1d 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Kombinieren Sie mehrere Datumsumfragen in einer einzigen Ansicht",
"Add new Poll" : "Neue Umfrage hinzufügen",
"Combine polls" : "Umfragen kombinieren",
- "Personal settings" : "Persönliche Einstellungen",
+ "Polls settings" : "Umfragen-Einstellungen",
"Error loading poll list" : "Fehler beim Laden der Umfrageliste",
"Error cloning poll." : "Fehler beim Klonen der Umfrage.",
"404 - poll not found" : "404 - Umfrage nicht gefunden",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 0ad70d91..d0df7254 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Kombinieren Sie mehrere Datumsumfragen in einer einzigen Ansicht",
"Add new Poll" : "Neue Umfrage hinzufügen",
"Combine polls" : "Umfragen kombinieren",
- "Personal settings" : "Persönliche Einstellungen",
+ "Polls settings" : "Umfragen-Einstellungen",
"Error loading poll list" : "Fehler beim Laden der Umfrageliste",
"Error cloning poll." : "Fehler beim Klonen der Umfrage.",
"404 - poll not found" : "404 - Umfrage nicht gefunden",
diff --git a/l10n/el.js b/l10n/el.js
index 1fdcfdac..2c4fed7f 100644
--- a/l10n/el.js
+++ b/l10n/el.js
@@ -476,7 +476,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Συνδυάστε πολλαπλές δημοσκοπήσεις ημερομηνίας σε μια ενιαία προβολή",
"Add new Poll" : "Προσθήκη νέας δημοσκόπησης",
"Combine polls" : "Συνδυάστε δημοσκοπήσεις",
- "Personal settings" : "Προσωπικές ρυθμίσεις",
"Error loading poll list" : "Σφάλμα φόρτωσης λίστας δημοσκοπήσεων",
"Error cloning poll." : "Σφάλμα κλωνοποίησης δημοσκόπησης.",
"404 - poll not found" : "404 - η δημοσκόπηση δεν βρέθηκε",
diff --git a/l10n/el.json b/l10n/el.json
index b696c08f..57702b81 100644
--- a/l10n/el.json
+++ b/l10n/el.json
@@ -474,7 +474,6 @@
"Combine multiple date polls in a single view" : "Συνδυάστε πολλαπλές δημοσκοπήσεις ημερομηνίας σε μια ενιαία προβολή",
"Add new Poll" : "Προσθήκη νέας δημοσκόπησης",
"Combine polls" : "Συνδυάστε δημοσκοπήσεις",
- "Personal settings" : "Προσωπικές ρυθμίσεις",
"Error loading poll list" : "Σφάλμα φόρτωσης λίστας δημοσκοπήσεων",
"Error cloning poll." : "Σφάλμα κλωνοποίησης δημοσκόπησης.",
"404 - poll not found" : "404 - η δημοσκόπηση δεν βρέθηκε",
diff --git a/l10n/es.js b/l10n/es.js
index 1b28554b..7e57383b 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -492,7 +492,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Combinar varias votaciones de fecha en una misma vista",
"Add new Poll" : "Añadir nueva Votación",
"Combine polls" : "Combinar votaciones",
- "Personal settings" : "Ajustes personales",
"Error loading poll list" : "Error al cargar la lista de votaciones",
"Error cloning poll." : "Error al clonar votación.",
"404 - poll not found" : "404 - votación no encontrada",
diff --git a/l10n/es.json b/l10n/es.json
index fd3df603..28587e9a 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -490,7 +490,6 @@
"Combine multiple date polls in a single view" : "Combinar varias votaciones de fecha en una misma vista",
"Add new Poll" : "Añadir nueva Votación",
"Combine polls" : "Combinar votaciones",
- "Personal settings" : "Ajustes personales",
"Error loading poll list" : "Error al cargar la lista de votaciones",
"Error cloning poll." : "Error al clonar votación.",
"404 - poll not found" : "404 - votación no encontrada",
diff --git a/l10n/eu.js b/l10n/eu.js
index ce41dbb3..59fae7d5 100644
--- a/l10n/eu.js
+++ b/l10n/eu.js
@@ -501,7 +501,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Batu data-galdeketa anitz ikuspegi bakarrean",
"Add new Poll" : "Gehitu bozketa berria",
"Combine polls" : "Batu galdeketak",
- "Personal settings" : "Ezarpen pertsonalak",
"Error loading poll list" : "Errorea bozketa zerrenda kargatzean",
"Error cloning poll." : "Errorea bozketa klonatzean.",
"404 - poll not found" : "404 - ez da bozketa aurkitu",
diff --git a/l10n/eu.json b/l10n/eu.json
index 42113d23..42a62266 100644
--- a/l10n/eu.json
+++ b/l10n/eu.json
@@ -499,7 +499,6 @@
"Combine multiple date polls in a single view" : "Batu data-galdeketa anitz ikuspegi bakarrean",
"Add new Poll" : "Gehitu bozketa berria",
"Combine polls" : "Batu galdeketak",
- "Personal settings" : "Ezarpen pertsonalak",
"Error loading poll list" : "Errorea bozketa zerrenda kargatzean",
"Error cloning poll." : "Errorea bozketa klonatzean.",
"404 - poll not found" : "404 - ez da bozketa aurkitu",
diff --git a/l10n/fi.js b/l10n/fi.js
index f79091e6..344791f0 100644
--- a/l10n/fi.js
+++ b/l10n/fi.js
@@ -293,7 +293,6 @@ OC.L10N.register(
"Administration" : "Ylläpito",
"No polls selected" : "Kyselyitä ei ole valittu",
"Add new Poll" : "Lisää uusi kysely",
- "Personal settings" : "Henkilökohtaiset asetukset",
"Error loading poll list" : "Virhe ladatessa kyselylistaa",
"Error cloning poll." : "Virhe kyselyä kloonatessa.",
"404 - poll not found" : "404 - äänestystä ei löytynyt",
diff --git a/l10n/fi.json b/l10n/fi.json
index 6802930c..299eb361 100644
--- a/l10n/fi.json
+++ b/l10n/fi.json
@@ -291,7 +291,6 @@
"Administration" : "Ylläpito",
"No polls selected" : "Kyselyitä ei ole valittu",
"Add new Poll" : "Lisää uusi kysely",
- "Personal settings" : "Henkilökohtaiset asetukset",
"Error loading poll list" : "Virhe ladatessa kyselylistaa",
"Error cloning poll." : "Virhe kyselyä kloonatessa.",
"404 - poll not found" : "404 - äänestystä ei löytynyt",
diff --git a/l10n/fr.js b/l10n/fr.js
index c6a5166a..9ae41c31 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -5,6 +5,11 @@ OC.L10N.register(
"Circle" : "Cercle",
"Contact group" : "Groupe de contact",
"Group" : "Groupe",
+ "Poll \"%s\" - Confirmation" : "Sondage \"%s\" - Confirmation",
+ "This email is sent to you to inform you about the result of a poll you participated in. At least your name or your email address was recorded in this poll. If you want to be removed from this poll, contact the site administrator or the poll initiator, where the mail is sent from." : "Ce courriel vous est envoyé pour vous informer des résultats d'un sondage auquel vous avez participé. Votre nom ou votre adresse courriel ont été enregistrée dans ce sondage. Si vous voulez être retiré de ce sondage, contacter l'administrateur du site ou l'initiateur du sondage, duquel ce courriel est envoyé.",
+ "{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} souhaite vous informer des résultats définitifs du sondage \"{title}\"",
+ "_Confirmed option:_::_Confirmed options:_" : ["Option confirmée :","Options confirmées :","Options confirmées :"],
+ "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Le fuseau horaire actuel est \"%s\", basé sur votre fuseau horaire à l'inscription. Pour voir les horaires dans votre fuseau horaire actuel, sélectionner le sondage en cliquant sur le bouton ci-dessous.",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Ce lien vous donne un accès personnel au sondage ci-dessus. Cliquez sur le bouton ou copiez le lien et insérez-le dans la barre d'adresse de votre navigateur.",
"Do not share this link with other people, because it is connected to your votes." : "Ne partagez pas ce lien avec d’autres personnes, car il est lié à vos votes.",
"Poll invitation \"%s\"" : "Invitation au sondage \"%s\"",
@@ -90,6 +95,8 @@ OC.L10N.register(
"{actor} has shared poll {pollTitle} with {sharee}" : "{actor} a partagé le sondage {pollTitle} avec {sharee}",
"You have changed your email address" : "Vous avez modifié votre adresse e-mail",
"{sharee} has changed his email address" : "{sharee} a modifié son adresse e-mail",
+ "You have changed your name" : "Vous avez changé votre nom",
+ "{sharee} has changed his name" : "{sharee} a changé son nom",
"You have changed the share type" : "Vous avez changé le type de partage",
"{actor} has changed the share type" : "{actor} a changé le type de partage",
"You have changed the registration constraints for share {sharee}" : "Vous avez changé les conditions d'inscription pour le partage {sharee}",
@@ -150,6 +157,7 @@ OC.L10N.register(
"You have shared this poll with {sharee}" : "Vous avez partagé ce sondage avec {sharee}",
"{actor} has shared this poll with {sharee}" : "{actor} a partagé ce sondage avec {sharee}",
"Email address of {sharee} has been changed" : "L'adresse e-mail de {sharee} a été modifié",
+ "Display name of {sharee} has been changed" : "Le nom de {sharee} a été changé",
"You have registered" : "Vous vous êtes inscrit",
"{sharee} has registered" : "{sharee} s'est inscrit",
"You have deleted a public share" : "Vous avez supprimé un partage public",
@@ -174,6 +182,14 @@ OC.L10N.register(
"Switch to table view" : "Basculer en mode tableau",
"Delete" : "Supprimer",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Suppression dans {countdown} seconde","Suppression dans {countdown} secondes","Suppression dans {countdown} secondes"],
+ "Send confirmation emails" : "Envoyer des courriels de confirmation",
+ "Sent emails to:" : "Courriels envoyés à :",
+ "Emails could not be sent:" : "Les courriels n'ont pas pu être envoyés :",
+ "Send information about confirmed options by email" : "Envoyer par courriel l'information à propos des options confirmées",
+ "Inform your participants about the confirmed options" : "Informer vos participants des options confirmées",
+ "Confirmations processed" : "Confirmations traitées",
+ "Confirmation sent to ${confirmation}" : "Confirmation envoyée à ${confirmation}",
+ "Confirmation could not be sent to ${confirmation}" : "La confirmation n'a pas pu être envoyée à ${confirmation}",
"Date order" : "Ordre de date",
"Original order" : "Ordre original",
"Ranked order" : "Ordre classé",
@@ -312,6 +328,7 @@ OC.L10N.register(
"Public participation" : "Participation publique",
"To participate, tell us how we can call you!" : "Merci de bien vouloir nous préciser votre nom.",
"Enter your name" : "Saisissez votre nom",
+ "Remember me for 30 days" : "Rappelez moi dans 30 jours",
"You are a registered user of this site?" : "Êtes-vous enregistré en tant qu'utilisateur ?",
"Login" : "Se connecter",
"As a regular user of this site, you can participate with your internal identity after logging in." : "En tant qu'utilisateur du site, vous pouvez participer avec vos identifiants après vous être connecté.",
@@ -381,6 +398,7 @@ OC.L10N.register(
"Dark picture" : "Image sombre",
"Translucent foreground elements" : "Éléments de premier plan translucides",
"Add a translucent effect on foreground elements like sidebar and poll table (Does not work with all browsers)." : "Ajouter un effet translucide sur les éléments au premier plan comme la barre latérale et le tableau du sondage (ne fonctionne pas avec tous les navigateurs)",
+ "Use alternative styling for the comments sidebar" : "Utiliser un style alternatif pour la barre latérale des commentaires",
"Calendar check" : "Vérification du calendrier",
"User settings" : "Paramètres utilisateurs",
"Performance settings" : "Paramètres de performance",
@@ -440,10 +458,14 @@ OC.L10N.register(
"Remove Email Address" : "Supprimer l'adresse e-mail",
"Copy list of email addresses to clipboard" : "Copier la liste des adresses email vers le presse-papiers",
"Reset your votes" : "Remettre à zéro vos votes",
+ "Logout as {name} (delete cookie)" : "Déconnexion de {name} (suppression du cookie)",
"Email address deleted." : "Adresse e-mail supprimée.",
"Error deleting email address {emailAddress}" : "Erreur lors de la suppression de l'adresse e-mail {emailAddress}",
+ "Valid name." : "Nom valide.",
"Email address {emailAddress} saved." : "Adresse e-mail {emailAddress} enregistrée.",
"Error saving email address {emailAddress}" : "Erreur lors de l'enregistrement de l'adresse e-mail {emailAddress}",
+ "Name changed." : "Nom changé.",
+ "Error changing name." : "Erreur au changement de nom.",
"Invitation resent to {emailAddress}" : "Invitation renvoyée à {emailAddress}",
"Mail could not be resent to {emailAddress}" : "Impossible de renvoyer l'invitation à {emailAddress}",
"Your votes are reset" : "Vos votes sont remis à zéro",
@@ -484,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Combiner plusieurs sondages de date en une vue unique",
"Add new Poll" : "Ajouter un nouveau sondage",
"Combine polls" : "Combiner les sondages",
- "Personal settings" : "Paramètres personnels",
+ "Polls settings" : "Paramètres du sondage",
"Error loading poll list" : "Erreur lors du chargement de la liste des sondages",
"Error cloning poll." : "Erreur de duplication du sondage.",
"404 - poll not found" : "404 - sondage introuvable",
diff --git a/l10n/fr.json b/l10n/fr.json
index 91ad65c6..8d82e35a 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -3,6 +3,11 @@
"Circle" : "Cercle",
"Contact group" : "Groupe de contact",
"Group" : "Groupe",
+ "Poll \"%s\" - Confirmation" : "Sondage \"%s\" - Confirmation",
+ "This email is sent to you to inform you about the result of a poll you participated in. At least your name or your email address was recorded in this poll. If you want to be removed from this poll, contact the site administrator or the poll initiator, where the mail is sent from." : "Ce courriel vous est envoyé pour vous informer des résultats d'un sondage auquel vous avez participé. Votre nom ou votre adresse courriel ont été enregistrée dans ce sondage. Si vous voulez être retiré de ce sondage, contacter l'administrateur du site ou l'initiateur du sondage, duquel ce courriel est envoyé.",
+ "{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} souhaite vous informer des résultats définitifs du sondage \"{title}\"",
+ "_Confirmed option:_::_Confirmed options:_" : ["Option confirmée :","Options confirmées :","Options confirmées :"],
+ "The used time zone is \"%s\", based on the detected time zone at your registration time. To view the times in your current time zone, enter the poll by clicking the button below." : "Le fuseau horaire actuel est \"%s\", basé sur votre fuseau horaire à l'inscription. Pour voir les horaires dans votre fuseau horaire actuel, sélectionner le sondage en cliquant sur le bouton ci-dessous.",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Ce lien vous donne un accès personnel au sondage ci-dessus. Cliquez sur le bouton ou copiez le lien et insérez-le dans la barre d'adresse de votre navigateur.",
"Do not share this link with other people, because it is connected to your votes." : "Ne partagez pas ce lien avec d’autres personnes, car il est lié à vos votes.",
"Poll invitation \"%s\"" : "Invitation au sondage \"%s\"",
@@ -88,6 +93,8 @@
"{actor} has shared poll {pollTitle} with {sharee}" : "{actor} a partagé le sondage {pollTitle} avec {sharee}",
"You have changed your email address" : "Vous avez modifié votre adresse e-mail",
"{sharee} has changed his email address" : "{sharee} a modifié son adresse e-mail",
+ "You have changed your name" : "Vous avez changé votre nom",
+ "{sharee} has changed his name" : "{sharee} a changé son nom",
"You have changed the share type" : "Vous avez changé le type de partage",
"{actor} has changed the share type" : "{actor} a changé le type de partage",
"You have changed the registration constraints for share {sharee}" : "Vous avez changé les conditions d'inscription pour le partage {sharee}",
@@ -148,6 +155,7 @@
"You have shared this poll with {sharee}" : "Vous avez partagé ce sondage avec {sharee}",
"{actor} has shared this poll with {sharee}" : "{actor} a partagé ce sondage avec {sharee}",
"Email address of {sharee} has been changed" : "L'adresse e-mail de {sharee} a été modifié",
+ "Display name of {sharee} has been changed" : "Le nom de {sharee} a été changé",
"You have registered" : "Vous vous êtes inscrit",
"{sharee} has registered" : "{sharee} s'est inscrit",
"You have deleted a public share" : "Vous avez supprimé un partage public",
@@ -172,6 +180,14 @@
"Switch to table view" : "Basculer en mode tableau",
"Delete" : "Supprimer",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Suppression dans {countdown} seconde","Suppression dans {countdown} secondes","Suppression dans {countdown} secondes"],
+ "Send confirmation emails" : "Envoyer des courriels de confirmation",
+ "Sent emails to:" : "Courriels envoyés à :",
+ "Emails could not be sent:" : "Les courriels n'ont pas pu être envoyés :",
+ "Send information about confirmed options by email" : "Envoyer par courriel l'information à propos des options confirmées",
+ "Inform your participants about the confirmed options" : "Informer vos participants des options confirmées",
+ "Confirmations processed" : "Confirmations traitées",
+ "Confirmation sent to ${confirmation}" : "Confirmation envoyée à ${confirmation}",
+ "Confirmation could not be sent to ${confirmation}" : "La confirmation n'a pas pu être envoyée à ${confirmation}",
"Date order" : "Ordre de date",
"Original order" : "Ordre original",
"Ranked order" : "Ordre classé",
@@ -310,6 +326,7 @@
"Public participation" : "Participation publique",
"To participate, tell us how we can call you!" : "Merci de bien vouloir nous préciser votre nom.",
"Enter your name" : "Saisissez votre nom",
+ "Remember me for 30 days" : "Rappelez moi dans 30 jours",
"You are a registered user of this site?" : "Êtes-vous enregistré en tant qu'utilisateur ?",
"Login" : "Se connecter",
"As a regular user of this site, you can participate with your internal identity after logging in." : "En tant qu'utilisateur du site, vous pouvez participer avec vos identifiants après vous être connecté.",
@@ -379,6 +396,7 @@
"Dark picture" : "Image sombre",
"Translucent foreground elements" : "Éléments de premier plan translucides",
"Add a translucent effect on foreground elements like sidebar and poll table (Does not work with all browsers)." : "Ajouter un effet translucide sur les éléments au premier plan comme la barre latérale et le tableau du sondage (ne fonctionne pas avec tous les navigateurs)",
+ "Use alternative styling for the comments sidebar" : "Utiliser un style alternatif pour la barre latérale des commentaires",
"Calendar check" : "Vérification du calendrier",
"User settings" : "Paramètres utilisateurs",
"Performance settings" : "Paramètres de performance",
@@ -438,10 +456,14 @@
"Remove Email Address" : "Supprimer l'adresse e-mail",
"Copy list of email addresses to clipboard" : "Copier la liste des adresses email vers le presse-papiers",
"Reset your votes" : "Remettre à zéro vos votes",
+ "Logout as {name} (delete cookie)" : "Déconnexion de {name} (suppression du cookie)",
"Email address deleted." : "Adresse e-mail supprimée.",
"Error deleting email address {emailAddress}" : "Erreur lors de la suppression de l'adresse e-mail {emailAddress}",
+ "Valid name." : "Nom valide.",
"Email address {emailAddress} saved." : "Adresse e-mail {emailAddress} enregistrée.",
"Error saving email address {emailAddress}" : "Erreur lors de l'enregistrement de l'adresse e-mail {emailAddress}",
+ "Name changed." : "Nom changé.",
+ "Error changing name." : "Erreur au changement de nom.",
"Invitation resent to {emailAddress}" : "Invitation renvoyée à {emailAddress}",
"Mail could not be resent to {emailAddress}" : "Impossible de renvoyer l'invitation à {emailAddress}",
"Your votes are reset" : "Vos votes sont remis à zéro",
@@ -482,7 +504,7 @@
"Combine multiple date polls in a single view" : "Combiner plusieurs sondages de date en une vue unique",
"Add new Poll" : "Ajouter un nouveau sondage",
"Combine polls" : "Combiner les sondages",
- "Personal settings" : "Paramètres personnels",
+ "Polls settings" : "Paramètres du sondage",
"Error loading poll list" : "Erreur lors du chargement de la liste des sondages",
"Error cloning poll." : "Erreur de duplication du sondage.",
"404 - poll not found" : "404 - sondage introuvable",
diff --git a/l10n/hu.js b/l10n/hu.js
index 1bb2f379..46dd1be0 100644
--- a/l10n/hu.js
+++ b/l10n/hu.js
@@ -506,7 +506,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Több dátumszavazás összevonása egyetlen nézetbe",
"Add new Poll" : "Új szavazás hozzáadása",
"Combine polls" : "Szavazások összevonása",
- "Personal settings" : "Személyes beállítások",
"Error loading poll list" : "Hiba a szavazások betöltése során",
"Error cloning poll." : "Hiba a szavazás klónozása során.",
"404 - poll not found" : "404 – a szavazás nem található",
diff --git a/l10n/hu.json b/l10n/hu.json
index fc878cf4..f62a7aed 100644
--- a/l10n/hu.json
+++ b/l10n/hu.json
@@ -504,7 +504,6 @@
"Combine multiple date polls in a single view" : "Több dátumszavazás összevonása egyetlen nézetbe",
"Add new Poll" : "Új szavazás hozzáadása",
"Combine polls" : "Szavazások összevonása",
- "Personal settings" : "Személyes beállítások",
"Error loading poll list" : "Hiba a szavazások betöltése során",
"Error cloning poll." : "Hiba a szavazás klónozása során.",
"404 - poll not found" : "404 – a szavazás nem található",
diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js
index 6dfde52b..2f2b4d5a 100644
--- a/l10n/lt_LT.js
+++ b/l10n/lt_LT.js
@@ -3,6 +3,7 @@ OC.L10N.register(
{
"Circle" : "Ratas",
"Group" : "Grupė",
+ "{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} nori jus informuoti apie galutinius apklausos „{title}“ rezultatus",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Ši nuoroda suteikia jums asmeninę prieigą prie aukščiau paminėtos apklausos. Spustelėkite aukščiau esantį mygtuką arba nukopijuokite sekančią nuorodą ir įdėkite ją į savo naršyklės adresų juostą:",
"Do not share this link with other people, because it is connected to your votes." : "Nebendrinkite šios nuorodos su kitais žmonėmis, nes ji yra susieta su jūsų balsais.",
"Poll invitation \"%s\"" : "Kvietimas dalyvauti apklausoje \"%s\"",
@@ -23,6 +24,7 @@ OC.L10N.register(
"A voting option has been removed." : "Pašalintas balsavimo variantas.",
"The poll owner has been changed." : "Pasikeitė apklausos savininkas.",
"%s created the poll." : "%s sukūrė apklausą.",
+ "%s has left a comment." : "%s pakomentavo.",
"Contact" : "Adresatas",
"External Email" : "Išorinis el. paštas",
"External user" : "Išorinis naudotojas",
@@ -39,6 +41,8 @@ OC.L10N.register(
"{actor} archived your poll \"%s\"." : "{actor} užarchyvavo jūsų apklausą \"%s\".",
"You have changed your email address" : "Jūs pasikeitėte el. pašto adresą",
"{sharee} has changed his email address" : "{sharee} pasikeitė el. pašto adresą",
+ "You have changed your name" : "Jūs pasikeitėte vardą",
+ "{sharee} has changed his name" : "{sharee} pasikeitė vardą",
"You have deleted a comment" : "Jūs ištrynėte komentarą",
"{actor} has deleted a comment" : "{actor} ištrynė komentarą",
"You have added an option" : "Jūs pridėjote variantą",
@@ -53,11 +57,16 @@ OC.L10N.register(
"{actor} has changed the poll owner" : "{actor} pakeitė apklausos savininką",
"You have reordered the options" : "Jūs pakeitėte variantų tvarką",
"{actor} has reordered the options" : "{actor} pakeitė variantų tvarką",
+ "You have added a public share" : "Jūs pridėjote viešą viešinį",
+ "{actor} has added a public share" : "{actor} pridėjo viešą viešinį",
+ "You have deleted a public share" : "Jūs ištrynėte viešą viešinį",
+ "{actor} has deleted a public share" : "{actor} ištrynė viešą viešinį",
"{actor} has deleted a share" : "{actor} ištrynė viešinį",
"Switch to list view" : "Perjungti į sąrašo rodinį",
"Switch to table view" : "Perjungti į lentelės rodinį",
"Delete" : "Ištrinti",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Ištrinama po {countdown} sekundės","Ištrinama po {countdown} sekundžių","Ištrinama po {countdown} sekundžių","Ištrinama po {countdown} sekundės"],
+ "Emails could not be sent:" : "Nepavyko išsiųsti el. laiškų:",
"Date order" : "Datų tvarka",
"Original order" : "Pradinė tvarka",
"Ranked order" : "Išrikiuota tvarka",
@@ -165,6 +174,8 @@ OC.L10N.register(
"Otherwise participate publicly." : "Priešingu atveju, dalyvaukite viešai.",
"Your email address is required. After the registration your personal link to the poll will be sent to this address." : "Reikia jūsų el. pašto adreso. Po registracijos jums šiuo el. pašto adresu bus išsiųsta asmeninė nuoroda į apklausą.",
"With your email address you can subscribe to notifications and you will receive your personal link to this poll." : "Naudodami el. pašto adresą, galite prenumeruoti pranešimus ir gauti asmeninę nuorodą į šią apklausą.",
+ "By clicking the \"OK\" button you accept our {privacyPolicy}." : "Spusteldami mygtuką „Gerai“, jūs sutinkate su mūsų {privacyPolicy}.",
+ "privacy policy" : "privatumo politika",
"Checking name …" : "Tikrinamas vardas…",
"Email could not be sent to {emailAddress}" : "Nepavyko išsiųsti el. laiško, adresu {emailAddress}",
"Error saving name" : "Klaida įrašant vardą",
@@ -174,6 +185,7 @@ OC.L10N.register(
"Closing date" : "Baigimo data",
"No description provided" : "Nepateikta jokio aprašo",
"Preview" : "Peržiūra",
+ "Hide email addresses of internal users" : "Slėpti vidinių naudotojų el. pašto adresus",
"Hide login option in public polls" : "Slėpti prisijungimo parinktį viešose apklausose",
"Archive closed polls automatically" : "Automatiškai archyvuoti baigtas apklausas",
"Use background image" : "Naudoti foninį paveikslą",
@@ -206,6 +218,7 @@ OC.L10N.register(
"Available Options" : "Prieinami variantai",
"Receive notification email on activity to {emailAddress}" : "Esant veiklai, gauti pranešimą el. paštu, adresu {emailAddress}",
"Receive notification email on activity" : "Esant veiklai, gauti pranešimą el. paštu",
+ "Internal access" : "Vidinė prieiga",
"Token: {token}" : "Prieigos raktas: {token}",
"This poll is private" : "Ši apklausa yra privati",
"Copy your personal link to clipboard" : "Kopijuoti jūsų asmeninę nuorodą į iškarpinę",
@@ -219,6 +232,8 @@ OC.L10N.register(
"Error deleting email address {emailAddress}" : "Klaida ištrinant el. pašto adresą {emailAddress}",
"Email address {emailAddress} saved." : "El. pašto adresas {emailAddress} įrašytas.",
"Error saving email address {emailAddress}" : "Klaida įrašant el. pašto adresą {emailAddress}",
+ "Name changed." : "Vardas pakeistas.",
+ "Error changing name." : "Klaida keičiant vardą.",
"Invitation resent to {emailAddress}" : "Pakvietimas išsiųstas iš naujo į {emailAddress}",
"Your votes are reset" : "Jūsų balsai yra atstatyti",
"Error while resetting votes" : "Klaida atstatant balsus",
@@ -228,6 +243,7 @@ OC.L10N.register(
"Delete votes" : "Ištrinti balsus",
"User {userId} removed" : "Naudotojas {userId} pašalintas",
"Poll creation restrictions" : "Apklausos kūrimo apribojimai",
+ "Email options" : "El. pašto parinktys",
"Other settings" : "Kiti nustatymai",
"Manage polls of other users. You can take over the ownership or delete polls." : "Tvarkyti kitų naudotojų apklausas. Galite perimti apklausų nuosavybės teisę ar jas ištrinti.",
"Add one or change category!" : "Pridėkite apklausą arba pakeiskite kategoriją!",
@@ -242,13 +258,14 @@ OC.L10N.register(
"Error archiving/restoring poll." : "Klaida archyvuojant/atkuriant apklausą.",
"Error overtaking poll." : "Klaida perimant apklausą.",
"Add new Poll" : "Pridėti naują apklausą",
- "Personal settings" : "Asmeniniai nustatymai",
+ "Polls settings" : "Apklausų nustatymai",
"Error loading poll list" : "Klaida įkeliant apklausų sąrašą",
"Error cloning poll." : "Klaida dubliuojant apklausą.",
"404 - poll not found" : "404 - apklausa nerasta",
"Enter a poll or start a new one." : "Įveskite apklausą arba pradėkite naują.",
"Goto Nextcloud" : "Eiti į Nextcloud",
"Error loading poll" : "Klaida įkeliant apklausą",
+ "No polls found" : "Nerasta jokių apklausų",
"Details" : "Išsamiau",
"Configuration" : "Konfigūracija",
"Options" : "Parinktys",
diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json
index 6e2dcb49..1a5a64a0 100644
--- a/l10n/lt_LT.json
+++ b/l10n/lt_LT.json
@@ -1,6 +1,7 @@
{ "translations": {
"Circle" : "Ratas",
"Group" : "Grupė",
+ "{owner} wants to inform you about the final result of the poll \"{title}\"" : "{owner} nori jus informuoti apie galutinius apklausos „{title}“ rezultatus",
"This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar:" : "Ši nuoroda suteikia jums asmeninę prieigą prie aukščiau paminėtos apklausos. Spustelėkite aukščiau esantį mygtuką arba nukopijuokite sekančią nuorodą ir įdėkite ją į savo naršyklės adresų juostą:",
"Do not share this link with other people, because it is connected to your votes." : "Nebendrinkite šios nuorodos su kitais žmonėmis, nes ji yra susieta su jūsų balsais.",
"Poll invitation \"%s\"" : "Kvietimas dalyvauti apklausoje \"%s\"",
@@ -21,6 +22,7 @@
"A voting option has been removed." : "Pašalintas balsavimo variantas.",
"The poll owner has been changed." : "Pasikeitė apklausos savininkas.",
"%s created the poll." : "%s sukūrė apklausą.",
+ "%s has left a comment." : "%s pakomentavo.",
"Contact" : "Adresatas",
"External Email" : "Išorinis el. paštas",
"External user" : "Išorinis naudotojas",
@@ -37,6 +39,8 @@
"{actor} archived your poll \"%s\"." : "{actor} užarchyvavo jūsų apklausą \"%s\".",
"You have changed your email address" : "Jūs pasikeitėte el. pašto adresą",
"{sharee} has changed his email address" : "{sharee} pasikeitė el. pašto adresą",
+ "You have changed your name" : "Jūs pasikeitėte vardą",
+ "{sharee} has changed his name" : "{sharee} pasikeitė vardą",
"You have deleted a comment" : "Jūs ištrynėte komentarą",
"{actor} has deleted a comment" : "{actor} ištrynė komentarą",
"You have added an option" : "Jūs pridėjote variantą",
@@ -51,11 +55,16 @@
"{actor} has changed the poll owner" : "{actor} pakeitė apklausos savininką",
"You have reordered the options" : "Jūs pakeitėte variantų tvarką",
"{actor} has reordered the options" : "{actor} pakeitė variantų tvarką",
+ "You have added a public share" : "Jūs pridėjote viešą viešinį",
+ "{actor} has added a public share" : "{actor} pridėjo viešą viešinį",
+ "You have deleted a public share" : "Jūs ištrynėte viešą viešinį",
+ "{actor} has deleted a public share" : "{actor} ištrynė viešą viešinį",
"{actor} has deleted a share" : "{actor} ištrynė viešinį",
"Switch to list view" : "Perjungti į sąrašo rodinį",
"Switch to table view" : "Perjungti į lentelės rodinį",
"Delete" : "Ištrinti",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Ištrinama po {countdown} sekundės","Ištrinama po {countdown} sekundžių","Ištrinama po {countdown} sekundžių","Ištrinama po {countdown} sekundės"],
+ "Emails could not be sent:" : "Nepavyko išsiųsti el. laiškų:",
"Date order" : "Datų tvarka",
"Original order" : "Pradinė tvarka",
"Ranked order" : "Išrikiuota tvarka",
@@ -163,6 +172,8 @@
"Otherwise participate publicly." : "Priešingu atveju, dalyvaukite viešai.",
"Your email address is required. After the registration your personal link to the poll will be sent to this address." : "Reikia jūsų el. pašto adreso. Po registracijos jums šiuo el. pašto adresu bus išsiųsta asmeninė nuoroda į apklausą.",
"With your email address you can subscribe to notifications and you will receive your personal link to this poll." : "Naudodami el. pašto adresą, galite prenumeruoti pranešimus ir gauti asmeninę nuorodą į šią apklausą.",
+ "By clicking the \"OK\" button you accept our {privacyPolicy}." : "Spusteldami mygtuką „Gerai“, jūs sutinkate su mūsų {privacyPolicy}.",
+ "privacy policy" : "privatumo politika",
"Checking name …" : "Tikrinamas vardas…",
"Email could not be sent to {emailAddress}" : "Nepavyko išsiųsti el. laiško, adresu {emailAddress}",
"Error saving name" : "Klaida įrašant vardą",
@@ -172,6 +183,7 @@
"Closing date" : "Baigimo data",
"No description provided" : "Nepateikta jokio aprašo",
"Preview" : "Peržiūra",
+ "Hide email addresses of internal users" : "Slėpti vidinių naudotojų el. pašto adresus",
"Hide login option in public polls" : "Slėpti prisijungimo parinktį viešose apklausose",
"Archive closed polls automatically" : "Automatiškai archyvuoti baigtas apklausas",
"Use background image" : "Naudoti foninį paveikslą",
@@ -204,6 +216,7 @@
"Available Options" : "Prieinami variantai",
"Receive notification email on activity to {emailAddress}" : "Esant veiklai, gauti pranešimą el. paštu, adresu {emailAddress}",
"Receive notification email on activity" : "Esant veiklai, gauti pranešimą el. paštu",
+ "Internal access" : "Vidinė prieiga",
"Token: {token}" : "Prieigos raktas: {token}",
"This poll is private" : "Ši apklausa yra privati",
"Copy your personal link to clipboard" : "Kopijuoti jūsų asmeninę nuorodą į iškarpinę",
@@ -217,6 +230,8 @@
"Error deleting email address {emailAddress}" : "Klaida ištrinant el. pašto adresą {emailAddress}",
"Email address {emailAddress} saved." : "El. pašto adresas {emailAddress} įrašytas.",
"Error saving email address {emailAddress}" : "Klaida įrašant el. pašto adresą {emailAddress}",
+ "Name changed." : "Vardas pakeistas.",
+ "Error changing name." : "Klaida keičiant vardą.",
"Invitation resent to {emailAddress}" : "Pakvietimas išsiųstas iš naujo į {emailAddress}",
"Your votes are reset" : "Jūsų balsai yra atstatyti",
"Error while resetting votes" : "Klaida atstatant balsus",
@@ -226,6 +241,7 @@
"Delete votes" : "Ištrinti balsus",
"User {userId} removed" : "Naudotojas {userId} pašalintas",
"Poll creation restrictions" : "Apklausos kūrimo apribojimai",
+ "Email options" : "El. pašto parinktys",
"Other settings" : "Kiti nustatymai",
"Manage polls of other users. You can take over the ownership or delete polls." : "Tvarkyti kitų naudotojų apklausas. Galite perimti apklausų nuosavybės teisę ar jas ištrinti.",
"Add one or change category!" : "Pridėkite apklausą arba pakeiskite kategoriją!",
@@ -240,13 +256,14 @@
"Error archiving/restoring poll." : "Klaida archyvuojant/atkuriant apklausą.",
"Error overtaking poll." : "Klaida perimant apklausą.",
"Add new Poll" : "Pridėti naują apklausą",
- "Personal settings" : "Asmeniniai nustatymai",
+ "Polls settings" : "Apklausų nustatymai",
"Error loading poll list" : "Klaida įkeliant apklausų sąrašą",
"Error cloning poll." : "Klaida dubliuojant apklausą.",
"404 - poll not found" : "404 - apklausa nerasta",
"Enter a poll or start a new one." : "Įveskite apklausą arba pradėkite naują.",
"Goto Nextcloud" : "Eiti į Nextcloud",
"Error loading poll" : "Klaida įkeliant apklausą",
+ "No polls found" : "Nerasta jokių apklausų",
"Details" : "Išsamiau",
"Configuration" : "Konfigūracija",
"Options" : "Parinktys",
diff --git a/l10n/pl.js b/l10n/pl.js
index e16713ad..e03d15a0 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Połącz wiele sond dat w jednym widoku",
"Add new Poll" : "Dodaj nową sondę",
"Combine polls" : "Połącz sondy",
- "Personal settings" : "Ustawienia osobiste",
+ "Polls settings" : "Ustawienia Sondy",
"Error loading poll list" : "Błąd ładowania listy sondy",
"Error cloning poll." : "Błąd podczas klonowania sondy.",
"404 - poll not found" : "404 - nie znaleziono sondy",
diff --git a/l10n/pl.json b/l10n/pl.json
index ae323444..f7fb22f7 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Połącz wiele sond dat w jednym widoku",
"Add new Poll" : "Dodaj nową sondę",
"Combine polls" : "Połącz sondy",
- "Personal settings" : "Ustawienia osobiste",
+ "Polls settings" : "Ustawienia Sondy",
"Error loading poll list" : "Błąd ładowania listy sondy",
"Error cloning poll." : "Błąd podczas klonowania sondy.",
"404 - poll not found" : "404 - nie znaleziono sondy",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index 47136837..64015dcb 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -501,7 +501,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Combine várias pesquisas de data em uma única visualização",
"Add new Poll" : "Adicionar nova Enquete",
"Combine polls" : "Reunir enquetes",
- "Personal settings" : "Configurações pessoais",
"Error loading poll list" : "Erro ao carregar a lista de enquetes",
"Error cloning poll." : "Erro ao clonar enquete.",
"404 - poll not found" : "404 - enquete não encontrada",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index a9f079d8..84a8d792 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -499,7 +499,6 @@
"Combine multiple date polls in a single view" : "Combine várias pesquisas de data em uma única visualização",
"Add new Poll" : "Adicionar nova Enquete",
"Combine polls" : "Reunir enquetes",
- "Personal settings" : "Configurações pessoais",
"Error loading poll list" : "Erro ao carregar a lista de enquetes",
"Error cloning poll." : "Erro ao clonar enquete.",
"404 - poll not found" : "404 - enquete não encontrada",
diff --git a/l10n/sl.js b/l10n/sl.js
index 6dd8dbe1..66e3e4ca 100644
--- a/l10n/sl.js
+++ b/l10n/sl.js
@@ -372,7 +372,6 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Združi več datumskih anket v en pogled",
"Add new Poll" : "Dodaj anketo",
"Combine polls" : "Združi ankete",
- "Personal settings" : "Osebne nastavitve",
"Error loading poll list" : "Prišlo je do napake nalaganja seznama anket",
"Error cloning poll." : "Napaka kloniranja ankete.",
"404 - poll not found" : "napaka 404 – ankete ni mogoče najti",
diff --git a/l10n/sl.json b/l10n/sl.json
index 6f18307f..b96a1952 100644
--- a/l10n/sl.json
+++ b/l10n/sl.json
@@ -370,7 +370,6 @@
"Combine multiple date polls in a single view" : "Združi več datumskih anket v en pogled",
"Add new Poll" : "Dodaj anketo",
"Combine polls" : "Združi ankete",
- "Personal settings" : "Osebne nastavitve",
"Error loading poll list" : "Prišlo je do napake nalaganja seznama anket",
"Error cloning poll." : "Napaka kloniranja ankete.",
"404 - poll not found" : "napaka 404 – ankete ni mogoče najti",
diff --git a/l10n/tr.js b/l10n/tr.js
index e0ff3077..d20acce8 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "Farklı tarihlerdeki anketleri tek görünümde birleştirin",
"Add new Poll" : "Anket ekle",
"Combine polls" : "Anketleri birleştir",
- "Personal settings" : "Kişisel ayarlar",
+ "Polls settings" : "Anketler ayarları",
"Error loading poll list" : "Anket listesi yüklenirken sorun çıktı",
"Error cloning poll." : "Anket kopyalanırken sorun çıktı.",
"404 - poll not found" : "404 - anket bulunamadı",
diff --git a/l10n/tr.json b/l10n/tr.json
index 01bddb19..36ef6482 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "Farklı tarihlerdeki anketleri tek görünümde birleştirin",
"Add new Poll" : "Anket ekle",
"Combine polls" : "Anketleri birleştir",
- "Personal settings" : "Kişisel ayarlar",
+ "Polls settings" : "Anketler ayarları",
"Error loading poll list" : "Anket listesi yüklenirken sorun çıktı",
"Error cloning poll." : "Anket kopyalanırken sorun çıktı.",
"404 - poll not found" : "404 - anket bulunamadı",
diff --git a/l10n/uk.js b/l10n/uk.js
index d10d3229..3da7a8c6 100644
--- a/l10n/uk.js
+++ b/l10n/uk.js
@@ -58,7 +58,6 @@ OC.L10N.register(
"Yes" : "Так",
"Administration" : "Адміністрування",
"Add new Poll" : "Додати нове опитування",
- "Personal settings" : "Персональні налаштування",
"Error loading poll list" : "Помилка завантаження списку опитування",
"Error loading poll" : "Помилка під час завантаження опитування",
"Details" : "Деталі",
diff --git a/l10n/uk.json b/l10n/uk.json
index 57fa0c81..0cbc206d 100644
--- a/l10n/uk.json
+++ b/l10n/uk.json
@@ -56,7 +56,6 @@
"Yes" : "Так",
"Administration" : "Адміністрування",
"Add new Poll" : "Додати нове опитування",
- "Personal settings" : "Персональні налаштування",
"Error loading poll list" : "Помилка завантаження списку опитування",
"Error loading poll" : "Помилка під час завантаження опитування",
"Details" : "Деталі",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index 749103c4..761ab5d4 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "在一個檢視中組合多個日期投票",
"Add new Poll" : "新增投票",
"Combine polls" : "聯合民意調查",
- "Personal settings" : "個人設定",
+ "Polls settings" : "投票設定",
"Error loading poll list" : "載入投票列表時發生錯誤",
"Error cloning poll." : "複製投票時發生錯誤。",
"404 - poll not found" : "404 - 找不到投票",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index e5c873bc..780da4d2 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "在一個檢視中組合多個日期投票",
"Add new Poll" : "新增投票",
"Combine polls" : "聯合民意調查",
- "Personal settings" : "個人設定",
+ "Polls settings" : "投票設定",
"Error loading poll list" : "載入投票列表時發生錯誤",
"Error cloning poll." : "複製投票時發生錯誤。",
"404 - poll not found" : "404 - 找不到投票",
diff --git a/l10n/zh_TW.js b/l10n/zh_TW.js
index 2999d7de..cc1a3027 100644
--- a/l10n/zh_TW.js
+++ b/l10n/zh_TW.js
@@ -506,7 +506,7 @@ OC.L10N.register(
"Combine multiple date polls in a single view" : "在一個檢視中組合多個日期投票",
"Add new Poll" : "新增投票",
"Combine polls" : "組合投票",
- "Personal settings" : "個人設定",
+ "Polls settings" : "投票設定",
"Error loading poll list" : "載入投票列表時發生錯誤",
"Error cloning poll." : "再製投票時發生錯誤。",
"404 - poll not found" : "404 - 找不到投票",
diff --git a/l10n/zh_TW.json b/l10n/zh_TW.json
index 3ac6b518..89553920 100644
--- a/l10n/zh_TW.json
+++ b/l10n/zh_TW.json
@@ -504,7 +504,7 @@
"Combine multiple date polls in a single view" : "在一個檢視中組合多個日期投票",
"Add new Poll" : "新增投票",
"Combine polls" : "組合投票",
- "Personal settings" : "個人設定",
+ "Polls settings" : "投票設定",
"Error loading poll list" : "載入投票列表時發生錯誤",
"Error cloning poll." : "再製投票時發生錯誤。",
"404 - poll not found" : "404 - 找不到投票",
diff --git a/package-lock.json b/package-lock.json
index 08900a7c..84597bee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^7.0.0-beta.3",
- "@nextcloud/vue-richtext": "^2.0.0",
+ "@nextcloud/vue-richtext": "^2.0.1",
"core-js": "^3.25.1",
"dompurify": "^2.4.0",
"file-saver": "^2.0.5",
@@ -2331,9 +2331,9 @@
}
},
"node_modules/@nextcloud/vue-richtext": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
- "integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.1.tgz",
+ "integrity": "sha512-/44HTGBqokWXyRQJyh2YJgnJK7xv0nKdHxwHqvVAmcnsp7tipc6C1aPRJeHGXgbHoo+DbdpVp4l3+hlVqeUkFA==",
"dependencies": {
"@nextcloud/axios": "^2.0.0",
"@nextcloud/router": "^2.0.0",
@@ -13920,9 +13920,9 @@
}
},
"@nextcloud/vue-richtext": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
- "integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.1.tgz",
+ "integrity": "sha512-/44HTGBqokWXyRQJyh2YJgnJK7xv0nKdHxwHqvVAmcnsp7tipc6C1aPRJeHGXgbHoo+DbdpVp4l3+hlVqeUkFA==",
"requires": {
"@nextcloud/axios": "^2.0.0",
"@nextcloud/router": "^2.0.0",
diff --git a/package.json b/package.json
index 0a580d4d..fd67c5f1 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^7.0.0-beta.3",
- "@nextcloud/vue-richtext": "^2.0.0",
+ "@nextcloud/vue-richtext": "^2.0.1",
"core-js": "^3.25.1",
"dompurify": "^2.4.0",
"file-saver": "^2.0.5",
diff --git a/src/js/Exceptions/Exceptions.js b/src/js/Exceptions/Exceptions.js
index e7f2a356..4e5ae135 100644
--- a/src/js/Exceptions/Exceptions.js
+++ b/src/js/Exceptions/Exceptions.js
@@ -38,4 +38,13 @@ class NotReady extends Error {
}
-export { Exception, NotReady }
+class InvalidJSON extends Error {
+
+ constructor(message) {
+ super(message)
+ this.name = 'InvalidJSON'
+ }
+
+}
+
+export { Exception, InvalidJSON, NotReady }
diff --git a/src/js/mixins/watchPolls.js b/src/js/mixins/watchPolls.js
index aadfcbfb..b88a7cd5 100644
--- a/src/js/mixins/watchPolls.js
+++ b/src/js/mixins/watchPolls.js
@@ -25,6 +25,7 @@ import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { mapState } from 'vuex'
+import { InvalidJSON } from '../Exceptions/Exceptions.js'
const defaultSleepTimeout = 30
@@ -53,53 +54,47 @@ export const watchPolls = {
methods: {
async watchPolls() {
- if (this.cancelToken) {
- // there is already a cancelToken, so just cancel the previous session and exit
- this.cancelWatch()
+ // quit if polling for updates is disabled
+ if (this.updateType === 'noPolling') {
return
}
- if (this.updateType === 'noPolling') {
- console.debug('[polls]', 'Polling for updates is disabled')
+ if (this.cancelToken) {
+ // there is already a cancelToken, so just cancel the previous session and exit
+ this.cancelWatch()
return
}
- console.debug('[polls]', 'Watch for updates')
this.cancelToken = axios.CancelToken.source()
while (this.retryCounter < this.maxTries) {
// reset sleep timer to default
this.sleepTimeout = defaultSleepTimeout
+ this.gotValidResponse = false
await this.$store.dispatch('appSettings/get')
+ if (this.updateType === 'noPolling') {
+ console.debug('[polls]', 'Polling for updates is disabled. Cancel watch.')
+ this.cancelWatch()
+ return
+ }
+
try {
- const response = await this.fetchUpdates()
-
- // check, if we got a valid json response
- if (response.headers['content-type'].includes('application/json')) {
- this.gotValidResponse = true
- console.debug('[polls]', `Update detected (${this.updateType})`, response.data.updates)
- this.loadTables(response.data.updates)
- this.retryCounter = 0 // reset retryCounter after we got a valid response
- } else {
- console.debug('[polls]', `No JSON response recieved, got "${response.headers['content-type']}"`)
- this.gotValidResponse = false
+ // Avoid requests, if the tab/window is not visible
+ if (!document.hidden) {
+ console.debug('[polls]', 'Watch for updates')
+ await this.handleResponse(await this.fetchUpdates())
}
-
} catch (e) {
if (axios.isCancel(e)) {
this.handleCanceledRequest()
- } else if (e.response?.status === 304) {
- this.handleNotModifiedResponse()
} else {
- this.gotValidResponse = false
- await this.handleConnectionError(e)
+ this.handleConnectionError(e)
}
}
- if (this.updateType === 'periodicPolling' || !this.gotValidResponse) {
- console.debug('[polls]', `Sleep for ${this.sleepTimeout} seconds`)
- await this.sleep(this.sleepTimeout)
+ if (this.updateType !== 'longPolling' || !this.gotValidResponse || document.hidden) {
+ await this.sleep()
}
}
@@ -115,8 +110,17 @@ export const watchPolls = {
this.cancelToken.cancel()
},
- sleep(timeout) {
- return new Promise((resolve) => setTimeout(resolve, timeout * 1000))
+ sleep() {
+ let reason = `Connection error, Attempt: ${this.retryCounter}/${this.maxTries})`
+
+ if (this.gotValidResponse) {
+ reason = this.updateType
+ } else if (document.hidden) {
+ reason = 'app is in background'
+ }
+
+ console.debug('[polls]', `Sleep for ${this.sleepTimeout} seconds (reason: ${reason})`)
+ return new Promise((resolve) => setTimeout(resolve, this.sleepTimeout * 1000))
},
async fetchUpdates() {
@@ -125,6 +129,7 @@ export const watchPolls = {
} else {
this.endPoint = `apps/polls/poll/${this.$route.params.id ?? 0}/watch`
}
+
return await axios.get(generateUrl(this.endPoint), {
params: { offset: this.lastUpdated },
cancelToken: this.cancelToken.token,
@@ -132,28 +137,47 @@ export const watchPolls = {
})
},
+ handleResponse(response) {
+ if (response.headers['content-type'].includes('application/json')) {
+ this.gotValidResponse = true
+ console.debug('[polls]', `Update detected (${this.updateType})`, response.data.updates)
+ this.loadTables(response.data.updates)
+ this.retryCounter = 0 // reset retryCounter after we got a valid response
+ return
+ }
+
+ // console.debug('[polls]', `No JSON response recieved, got "${response.headers['content-type']}"`)
+ this.gotValidResponse = false
+ throw new InvalidJSON(`No JSON response recieved, got "${response.headers['content-type']}"`)
+ },
+
handleCanceledRequest() {
console.debug('[polls]', 'Fetch canceled')
this.cancelToken = axios.CancelToken.source()
},
- handleNotModifiedResponse() {
- console.debug('[polls]', `No updates (using ${this.updateType})`)
- this.retryCounter = 0 // reset retryCounter, after we get a 304
- },
-
async handleConnectionError(e) {
+ if (e.response?.status === 304) {
+ console.debug('[polls]', `No updates (using ${this.updateType})`)
+ this.gotValidResponse = true
+ this.retryCounter = 0 // reset retryCounter, after we get a 304
+ return
+ }
+
this.retryCounter += 1
if (e?.response?.status === 503) {
// Server possibly in maintenance mode
this.sleepTimeout = e.response.headers['retry-after'] ?? this.sleepTimeout
console.debug('[polls]', `Service not avaiable - retry after ${this.sleepTimeout} seconds`)
- } else if (e.response) {
- console.error('[polls]', 'Unhandled error while watching polls updates', e)
- } else {
- console.debug('[polls]', e.message ?? `No response - request aborted - failed request ${this.retryCounter}/${this.maxTries}`)
+ return
}
+ if (e.response) {
+ console.error('[polls]', e)
+ return
+ }
+
+ console.debug('[polls]', e.message ?? `No response - request aborted - failed request ${this.retryCounter}/${this.maxTries}`)
},
async loadTables(tables) {