Skip to content

Commit

Permalink
Merge branch 'master' into enh/UserMapper
Browse files Browse the repository at this point in the history
  • Loading branch information
dartcafe authored Feb 9, 2024
2 parents 60a3c93 + 77e04a8 commit b917140
Show file tree
Hide file tree
Showing 14 changed files with 125 additions and 40 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/pr-feedback.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

name: 'Ask for feedback on PRs'
on:
schedule:
Expand Down Expand Up @@ -25,5 +30,5 @@ jobs:
Thank you for contributing to Nextcloud and we hope to hear from you soon!
days-before-feedback: 14
start-date: "2023-07-10"
exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot"
exempt-authors: "${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot,skjnldsv,datenangebot"
exempt-bots: true
30 changes: 15 additions & 15 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions l10n/en_GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ OC.L10N.register(
"Switch to table view" : "Switch to table view",
"Delete" : "Delete",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Deleting in {countdown} second","Deleting in {countdown} seconds"],
"Delete orphaned" : "Delete orphaned",
"Add some!" : "Add some!",
"Edit access" : "Edit access",
"Register" : "Register",
Expand All @@ -246,8 +247,15 @@ OC.L10N.register(
"The proposal period ends {timeRelative}." : "The proposal period ends {timeRelative}.",
"Although participant's names are hidden, this is not a real anonymous poll because they are not hidden from the owner." : "Although participant's names are hidden, this is not a real anonymous poll because they are not hidden from the owner.",
"Additionally the owner can remove the anonymous flag at any time, which will reveal the participant's names." : "Additionally the owner can remove the anonymous flag at any time, which will reveal the participant's names.",
"This poll is closed." : "This poll is closed.",
"No further action is possible." : "No further action is possible.",
"Due to possible performance issues {countHiddenParticipants} voters are hidden." : "Due to possible performance issues {countHiddenParticipants} voters are hidden.",
"You can reveal them, but you may expect an unwanted long loading time." : "You can reveal them, but you may expect an unwanted long loading time.",
"Limited votes." : "Limited votes.",
"_%n vote is allowed per option._::_%n votes are allowed per option._" : ["%n vote is allowed per option.","%n votes are allowed per option."],
"_%n vote is allowed per user._::_%n votes are allowed per user._" : ["%n vote is allowed per user.","%n votes are allowed per user."],
"_You have %n vote left._::_You have %n votes left._" : ["You have %n vote left.","You have %n votes left."],
"_%n orphaned vote of a probaly deleted option is possibly blocking your vote limit._::_%n orphaned votes of probaly deleted options are possibly blocking your vote limit._" : ["%n orphaned vote of a probaly deleted option is possibly blocking your vote limit.","%n orphaned votes of probaly deleted options are possibly blocking your vote limit."],
"This share is locked and allows only read access. Registering is not possible." : "This share is locked and allows only read access. Registering is not possible.",
"Your share is locked and you have just read access to this poll." : "Your share is locked and you have just read access to this poll.",
"To participate, register with your email address and a name." : "To participate, register with your email address and a name.",
Expand All @@ -257,6 +265,7 @@ OC.L10N.register(
"Some confirmation messages could not been sent." : "Some confirmation messages could not been sent.",
"Messages sent." : "Messages sent.",
"This poll is unpublished." : "This poll is unpublished.",
"Existing participants will still have access." : "Existing participants will still have access.",
"Invite users or allow internal access for all site users." : "Invite users or allow internal access for all site users.",
"New comment …" : "New comment …",
"Error while saving comment" : "Error while saving comment",
Expand Down Expand Up @@ -384,6 +393,7 @@ OC.L10N.register(
"_%n \"Yes\" vote_::_%n \"Yes\" votes_" : ["%n \"Yes\" vote","%n \"Yes\" votes"],
"_%n No vote_::_%n \"No\" votes_" : ["%n No vote","%n \"No\" votes"],
"_%n \"Maybe\" vote_::_%n \"Maybe\" votes_" : ["%n \"Maybe\" vote","%n \"Maybe\" votes"],
"_{usedVotes} of %n vote left._::_{usedVotes} of %n votes left._" : ["{usedVotes} of %n vote left.","{usedVotes} of %n votes left."],
"_Only %n vote per option._::_Only %n votes per option._" : ["Only %n vote per option.","Only %n votes per option."],
"Optional email address" : "Optional email address",
"Checking email address …" : "Checking email address …",
Expand Down Expand Up @@ -538,6 +548,7 @@ OC.L10N.register(
"Mail could not be resent to {emailAddress}" : "Mail could not be resent to {emailAddress}",
"Your votes are reset" : "Your votes are reset",
"Error while resetting votes" : "Error while resetting votes",
"Add shares" : "Add shares",
"Type to add an individual share" : "Type to add an individual share",
"Error while adding share" : "Error while adding share",
"Vote saved" : "Vote saved",
Expand Down
11 changes: 11 additions & 0 deletions l10n/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
"Switch to table view" : "Switch to table view",
"Delete" : "Delete",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["Deleting in {countdown} second","Deleting in {countdown} seconds"],
"Delete orphaned" : "Delete orphaned",
"Add some!" : "Add some!",
"Edit access" : "Edit access",
"Register" : "Register",
Expand All @@ -244,8 +245,15 @@
"The proposal period ends {timeRelative}." : "The proposal period ends {timeRelative}.",
"Although participant's names are hidden, this is not a real anonymous poll because they are not hidden from the owner." : "Although participant's names are hidden, this is not a real anonymous poll because they are not hidden from the owner.",
"Additionally the owner can remove the anonymous flag at any time, which will reveal the participant's names." : "Additionally the owner can remove the anonymous flag at any time, which will reveal the participant's names.",
"This poll is closed." : "This poll is closed.",
"No further action is possible." : "No further action is possible.",
"Due to possible performance issues {countHiddenParticipants} voters are hidden." : "Due to possible performance issues {countHiddenParticipants} voters are hidden.",
"You can reveal them, but you may expect an unwanted long loading time." : "You can reveal them, but you may expect an unwanted long loading time.",
"Limited votes." : "Limited votes.",
"_%n vote is allowed per option._::_%n votes are allowed per option._" : ["%n vote is allowed per option.","%n votes are allowed per option."],
"_%n vote is allowed per user._::_%n votes are allowed per user._" : ["%n vote is allowed per user.","%n votes are allowed per user."],
"_You have %n vote left._::_You have %n votes left._" : ["You have %n vote left.","You have %n votes left."],
"_%n orphaned vote of a probaly deleted option is possibly blocking your vote limit._::_%n orphaned votes of probaly deleted options are possibly blocking your vote limit._" : ["%n orphaned vote of a probaly deleted option is possibly blocking your vote limit.","%n orphaned votes of probaly deleted options are possibly blocking your vote limit."],
"This share is locked and allows only read access. Registering is not possible." : "This share is locked and allows only read access. Registering is not possible.",
"Your share is locked and you have just read access to this poll." : "Your share is locked and you have just read access to this poll.",
"To participate, register with your email address and a name." : "To participate, register with your email address and a name.",
Expand All @@ -255,6 +263,7 @@
"Some confirmation messages could not been sent." : "Some confirmation messages could not been sent.",
"Messages sent." : "Messages sent.",
"This poll is unpublished." : "This poll is unpublished.",
"Existing participants will still have access." : "Existing participants will still have access.",
"Invite users or allow internal access for all site users." : "Invite users or allow internal access for all site users.",
"New comment …" : "New comment …",
"Error while saving comment" : "Error while saving comment",
Expand Down Expand Up @@ -382,6 +391,7 @@
"_%n \"Yes\" vote_::_%n \"Yes\" votes_" : ["%n \"Yes\" vote","%n \"Yes\" votes"],
"_%n No vote_::_%n \"No\" votes_" : ["%n No vote","%n \"No\" votes"],
"_%n \"Maybe\" vote_::_%n \"Maybe\" votes_" : ["%n \"Maybe\" vote","%n \"Maybe\" votes"],
"_{usedVotes} of %n vote left._::_{usedVotes} of %n votes left._" : ["{usedVotes} of %n vote left.","{usedVotes} of %n votes left."],
"_Only %n vote per option._::_Only %n votes per option._" : ["Only %n vote per option.","Only %n votes per option."],
"Optional email address" : "Optional email address",
"Checking email address …" : "Checking email address …",
Expand Down Expand Up @@ -536,6 +546,7 @@
"Mail could not be resent to {emailAddress}" : "Mail could not be resent to {emailAddress}",
"Your votes are reset" : "Your votes are reset",
"Error while resetting votes" : "Error while resetting votes",
"Add shares" : "Add shares",
"Type to add an individual share" : "Type to add an individual share",
"Error while adding share" : "Error while adding share",
"Vote saved" : "Vote saved",
Expand Down
2 changes: 1 addition & 1 deletion l10n/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ OC.L10N.register(
"Optional email address" : "Adresse e-mail (optionnel)",
"Checking email address …" : "Vérification de l'adresse e-mail …",
"valid email address." : "adresse e-mail valide",
"Invalid email address." : "Adresse e-mail invalide.",
"Invalid email address." : "Adresse électronique invalide.",
"Access" : "Accès",
"Owner" : "Propriétaire",
"Created" : "Créé",
Expand Down
2 changes: 1 addition & 1 deletion l10n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
"Optional email address" : "Adresse e-mail (optionnel)",
"Checking email address …" : "Vérification de l'adresse e-mail …",
"valid email address." : "adresse e-mail valide",
"Invalid email address." : "Adresse e-mail invalide.",
"Invalid email address." : "Adresse électronique invalide.",
"Access" : "Accès",
"Owner" : "Propriétaire",
"Created" : "Créé",
Expand Down
11 changes: 11 additions & 0 deletions l10n/tr.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ OC.L10N.register(
"Switch to table view" : "Tablo görünümüne geç",
"Delete" : "Sil",
"_Deleting in {countdown} second_::_Deleting in {countdown} seconds_" : ["{countdown} saniye içinde silinecek","{countdown} saniye içinde silinecek"],
"Delete orphaned" : "Sahipsizleri sil",
"Add some!" : "Oy seçenekleri ekleyin!",
"Edit access" : "Erişimi düzenle",
"Register" : "Kayıt ol",
Expand All @@ -246,8 +247,15 @@ OC.L10N.register(
"The proposal period ends {timeRelative}." : "Öneri süresinin bitiş zamanı {timeRelative}",
"Although participant's names are hidden, this is not a real anonymous poll because they are not hidden from the owner." : "Katılımcı adları gizlenmiş olsa da, bu anket gerçekten anonim değildir. Kullanıcı adları anket sahibinden gizlenmez.",
"Additionally the owner can remove the anonymous flag at any time, which will reveal the participant's names." : "Ayrıca, anket sahibi anketin anonimlik durumunu istediği zaman değiştirebilir. Bu durumda katılımcının adları açığa çıkar.",
"This poll is closed." : "Anket bitmiş.",
"No further action is possible." : "Başka bir işlem yapılamaz.",
"Due to possible performance issues {countHiddenParticipants} voters are hidden." : "Yaşanabilecek başarım sorunlarını engellemek için {countHiddenParticipants} oy veren gizlendi.",
"You can reveal them, but you may expect an unwanted long loading time." : "Gizlenen oy verenleri görüntüleyebilirsiniz ancak yükleme süresi istenmeyecek kadar uzun olabilir.",
"Limited votes." : "Sınırlı oy.",
"_%n vote is allowed per option._::_%n votes are allowed per option._" : ["Her seçenek için %n oy verilebilir.","Her seçenek için %n oy verilebilir."],
"_%n vote is allowed per user._::_%n votes are allowed per user._" : ["Her kullanıcı için %n oy verilebilir.","Her kullanıcı için %n oy verilebilir."],
"_You have %n vote left._::_You have %n votes left._" : ["Verebileceğiniz %n oy kaldı.","Verebileceğiniz %n oy kaldı."],
"_%n orphaned vote of a probaly deleted option is possibly blocking your vote limit._::_%n orphaned votes of probaly deleted options are possibly blocking your vote limit._" : ["Büyük olasılıkla silinmiş seçeneklerdeki %n sahipsiz oy, sayı sınırınızı aşıyor.","Büyük olasılıkla silinmiş seçeneklerdeki %n sahipsiz oy, sayı sınırınızı aşıyor."],
"This share is locked and allows only read access. Registering is not possible." : "Bu paylaşım kilitli ve yalnızca salt okunur erişime izin veriyor. Kayıt olunamaz.",
"Your share is locked and you have just read access to this poll." : "Paylaşımınız kilitlenmiş ve bu ankete yalnızca salt okunur olarak erişebilirsiniz.",
"To participate, register with your email address and a name." : "Katılmak için e-posta adresinizi ve bir ad yazarak kayıt olun.",
Expand All @@ -257,6 +265,7 @@ OC.L10N.register(
"Some confirmation messages could not been sent." : "Bazı onay iletileri gönderilemedi.",
"Messages sent." : "İletiler gönderildi.",
"This poll is unpublished." : "Bu anket yayından kaldırıldı.",
"Existing participants will still have access." : "Var olan katılımcılar hala erişebilir.",
"Invite users or allow internal access for all site users." : "Kullanıcıları çağırın ya da tüm site kullanıcılarının iç erişimine izin verin.",
"New comment …" : "Yorum ekle …",
"Error while saving comment" : "Yorum kaydedilirken sorun çıktı",
Expand Down Expand Up @@ -384,6 +393,7 @@ OC.L10N.register(
"_%n \"Yes\" vote_::_%n \"Yes\" votes_" : ["%n \"Evet\" oyu","%n \"Evet\" oyu"],
"_%n No vote_::_%n \"No\" votes_" : ["%n Hayır oyu","%n \"Hayır\" oyu"],
"_%n \"Maybe\" vote_::_%n \"Maybe\" votes_" : ["%n \"Belki\" oyu","%n \"Belki\" oyu"],
"_{usedVotes} of %n vote left._::_{usedVotes} of %n votes left._" : ["{usedVotes} / %n oy kaldı.","{usedVotes} / %n oy kaldı."],
"_Only %n vote per option._::_Only %n votes per option._" : ["Her seçenek için yalnızca %n oy.","Her seçenek için yalnızca %n oy."],
"Optional email address" : "İsteğe bağlı e-posta adresi",
"Checking email address …" : "E-posta adresiniz denetleniyor…",
Expand Down Expand Up @@ -538,6 +548,7 @@ OC.L10N.register(
"Mail could not be resent to {emailAddress}" : "Çağrı {emailAdress} adresine yeniden gönderilemedi",
"Your votes are reset" : "Oylarınız sıfırlandı",
"Error while resetting votes" : "Oylar sıfırlanırken sorun çıktı",
"Add shares" : "Paylaşımlar ekle",
"Type to add an individual share" : "Bireysel paylaşım eklemek için yazın",
"Error while adding share" : "Paylaşım eklenirken sorun çıktı",
"Vote saved" : "Oy kaydedildi",
Expand Down
Loading

0 comments on commit b917140

Please sign in to comment.