diff options
68 files changed, 873 insertions, 376 deletions
diff --git a/.meteor/versions b/.meteor/versions index 5157f679..aa05f11c 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -109,7 +109,7 @@ mobile-status-bar@1.1.0 modern-browsers@0.1.5 modules@0.15.0 modules-runtime@0.12.0 -momentjs:moment@2.24.0 +momentjs:moment@2.25.2 mongo@1.10.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 @@ -127,7 +127,7 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.8.0 npm-bcrypt@0.9.3 -npm-mongo@3.7.0 +npm-mongo@3.7.1 oauth@1.3.0 oauth2@1.3.0 observe-sequence@1.0.16 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3772e347..6a11a4fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,17 @@ This release adds the following server platforms: and adds the following features: - [Install Wekan to mobile homescreen icon and use fullscreen - PWA](https://github.com/commit/8d5adc04645e3e71423f16869f39b8d79969bccd). + PWA](https://github.com/wekan/wekan/commit/8d5adc04645e3e71423f16869f39b8d79969bccd). [Docs for iOS and Android at wiki PWA page](https://github.com/wekan/wekan/wiki/PWA). Thanks to xet7. +- [Add options to rebuild-wekan.sh to run Meteor in development mode where after + file change it rebuilds](https://github.com/wekan/wekan/commit/5f915ef966170ea7baca7ddeb11319bc08a26fef). + Thanks to xet7. + +and adds the following updates: + +- [Update dependencies](https://github.com/wekan/wekan/commit/75bdd33fda58ea0233f5b38c466bcb1a9b0406ab). + Thanks to xet7. and fixes the following bugs: @@ -19,6 +27,14 @@ and fixes the following bugs: - [Fix shortcuts list and support card shortcuts when hovering a card](https://github.com/wekan/wekan/pull/3066). Thanks to marc1006. +- [Add white-space:normal to copy-to-clipboard button in card + details](https://github.com/wekan/wekan/pull/3075). + Thanks to helioguardabaxo. +- [Fix avatar-image class](https://github.com/wekan/wekan/pull/3083). + Thanks to krupupakku. +- [Fix REST API so Create card does now allow an empty member + list](https://github.com/wekan/wekan/pull/3084). + Thanks to wackazong. Thanks to above GitHub users for their contributions and translators for their translations. diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 9208fdb2..b99c0c31 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -25,7 +25,6 @@ BlazeComponent.extendComponent({ }, onRendered() { - const self = this; function userIsAllowedToMove() { return Meteor.user(); } @@ -78,7 +77,7 @@ BlazeComponent.extendComponent({ }, boards() { - let query = { + const query = { archived: false, type: 'board', }; diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index c4b5c6d8..9b2268e9 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -386,3 +386,30 @@ CardEndDate.register('cardEndDate'); return this.date.get().format('l'); } }.register('minicardEndDate')); + +class VoteEndDate extends CardDate { + onCreated() { + super.onCreated(); + const self = this; + self.autorun(() => { + self.date.set(moment(self.data().getVoteEnd())); + }); + } + classes() { + const classes = 'end-date' + ' '; + return classes; + } + showDate() { + return this.date.get().format('l LT'); + } + showTitle() { + return `${TAPi18n.__('card-end-on')} ${this.date.get().format('LLLL')}`; + } + + events() { + return super.events().concat({ + 'click .js-edit-date': Popup.open('editVoteEndDate'), + }); + } +} +VoteEndDate.register('voteEndDate'); diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ae97e0e9..2aa77627 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -202,9 +202,12 @@ template(name="cardDetails") if getVoteQuestion hr .vote-title - h3 - i.fa.fa-thumbs-up - card-details-item-title {{_ 'vote-question'}} + div.flex + h3 + i.fa.fa-thumbs-up + | {{_ 'vote-question'}} + if getVoteEnd + +voteEndDate .vote-result if votePublic a.card-label.card-label-green.js-show-positive-votes {{ voteCountPositive }} @@ -212,10 +215,13 @@ template(name="cardDetails") else .card-label.card-label-green {{ voteCountPositive }} .card-label.card-label-red {{ voteCountNegative }} + unless ($and currentBoard.isPublic voteAllowNonBoardMembers ) + .card-label.card-label-gray {{ voteCount }} {{_ 'r-of' }} {{ currentBoard.activeMembers.length }} +viewer = getVoteQuestion - button.card-details-green.js-vote.js-vote-positive(class="{{#if voteState}}voted{{/if}}") {{_ 'vote-for-it'}} - button.card-details-red.js-vote.js-vote-negative(class="{{#if $eq voteState false}}voted{{/if}}") {{_ 'vote-against'}} + if showVotingButtons + button.card-details-green.js-vote.js-vote-positive(class="{{#if voteState}}voted{{/if}}") {{_ 'vote-for-it'}} + button.card-details-red.js-vote.js-vote-negative(class="{{#if $eq voteState false}}voted{{/if}}") {{_ 'vote-against'}} //- XXX We should use "editable" to avoid repetiting ourselves if canModifyCard @@ -333,16 +339,10 @@ template(name="cardDetailsActionsPopup") //li: a.js-members {{_ 'card-edit-members'}} //li: a.js-labels {{_ 'card-edit-labels'}} //li: a.js-attachments {{_ 'card-edit-attachments'}} - if getVoteQuestion - li - a.js-cancel-voting - i.fa.fa-thumbs-up - | {{_ 'card-cancel-voting'}} - else - li - a.js-start-voting - i.fa.fa-thumbs-up - | {{_ 'card-start-voting'}} + li + a.js-start-voting + i.fa.fa-thumbs-up + | {{_ 'card-edit-voting'}} li a.js-custom-fields i.fa.fa-list-alt @@ -465,14 +465,14 @@ template(name="cardAssigneesPopup") i.fa.fa-check if currentUser.isWorker ul.pop-over-list.js-card-assignee-list - li.item(class="{{#if currentUser.isCardAssignee}}active{{/if}}") - a.name.js-select-assignee(href="#") - +userAvatar(userId=currentUser._id) - span.full-name - = currentUser.profile.fullname - | (<span class="username">{{ currentUser.username }}</span>) - if currentUser.isCardAssignee - i.fa.fa-check + li.item(class="{{#if currentUser.isCardAssignee}}active{{/if}}") + a.name.js-select-assignee(href="#") + +userAvatar(userId=currentUser._id) + span.full-name + = currentUser.profile.fullname + | (<span class="username">{{ currentUser.username }}</span>) + if currentUser.isCardAssignee + i.fa.fa-check template(name="userAvatarAssignee") a.assignee.js-assignee(title="{{userData.profile.fullname}} ({{userData.username}})") @@ -519,7 +519,7 @@ template(name="cardMorePopup") = ' ' i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus") - button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}} + button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}} span.clearfix br h2 {{_ 'change-card-parent'}} @@ -564,20 +564,39 @@ template(name="setCardColorPopup") template(name="cardDeletePopup") p {{_ "card-delete-pop"}} unless archived - p {{_ "card-delete-suggest-archive"}} + p {{_ "card-delete-suggest-archive"}} + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} + +template(name="deleteVotePopup") + p {{_ "vote-delete-pop"}} button.js-confirm.negate.full(type="submit") {{_ 'delete'}} template(name="cardStartVotingPopup") form.edit-vote-question .fields label(for="vote") {{_ 'vote-question'}} - input.js-vote-field#vote(type="text" name="vote" value="{{card.getVoteQuestion}}" autofocus) - label(for="vote-public") {{_ 'vote-public'}} - a.js-toggle-vote-public - .materialCheckBox#vote-public(name="vote-public") + input.js-vote-field#vote(type="text" name="vote" value="{{getVoteQuestion}}" autofocus disabled="{{#if getVoteQuestion}}disabled{{/if}}") + .check-div + a.flex(class="{{#if getVoteQuestion}}is-disabled{{else}}js-toggle-vote-allow-non-members{{/if}}") + .materialCheckBox#vote-allow-non-members(name="vote-allow-non-members" class="{{#if voteAllowNonBoardMembers}}is-checked{{/if}}") + span {{_ 'allowNonBoardMembers'}} + .check-div + a.flex(class="{{#if getVoteQuestion}}is-disabled{{else}}js-toggle-vote-public{{/if}}") + .materialCheckBox#vote-public(name="vote-public" class="{{#if votePublic}}is-checked{{/if}}") + span {{_ 'vote-public'}} + .check-div.flex + i.fa.fa-hourglass-end + a.js-end-date + span + | {{_ 'card-end'}} + unless getVoteEnd + i.fa.fa-plus + if getVoteEnd + +voteEndDate - button.primary.confirm.js-submit {{_ 'save'}} - //- button.js-remove-color.negate.wide.right {{_ 'delete'}} + button.primary.js-submit {{_ 'save'}} + if getVoteQuestion + button.js-remove-vote.negate.wide.right {{_ 'delete'}} template(name="positiveVoteMembersPopup") ul.pop-over-list.js-card-member-list diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 271fbe2f..7dcadfe3 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -54,21 +54,6 @@ BlazeComponent.extendComponent({ } return null; }, - votePublic() { - const card = this.currentData(); - if (card.vote) return card.vote.public; - return null; - }, - voteCountPositive() { - const card = this.currentData(); - if (card.vote && card.vote.positive) return card.vote.positive.length; - return null; - }, - voteCountNegative() { - const card = this.currentData(); - if (card.vote && card.vote.negative) return card.vote.negative.length; - return null; - }, isWatching() { const card = this.currentData(); return card.findWatcher(Meteor.userId()); @@ -148,6 +133,15 @@ BlazeComponent.extendComponent({ return result; }, + showVotingButtons() { + const card = this.currentData(); + return ( + (currentUser.isBoardMember() || + (currentUser && card.voteAllowNonBoardMembers())) && + !card.expiredVote() + ); + }, + onRendered() { if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) { // Send Webhook but not create Activities records --- @@ -611,11 +605,6 @@ Template.cardDetailsActionsPopup.events({ 'click .js-copy-card': Popup.open('copyCard'), 'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'), 'click .js-set-card-color': Popup.open('setCardColor'), - 'click .js-cancel-voting'(event) { - event.preventDefault(); - this.unsetVote(); - Popup.close(); - }, 'click .js-move-card-to-top'(event) { event.preventDefault(); const minOrder = _.min( @@ -1000,22 +989,93 @@ BlazeComponent.extendComponent({ events() { return [ { + 'click .js-end-date': Popup.open('editVoteEndDate'), 'submit .edit-vote-question'(evt) { evt.preventDefault(); const voteQuestion = evt.target.vote.value; const publicVote = $('#vote-public').hasClass('is-checked'); - this.currentCard.setVoteQuestion(voteQuestion, publicVote); + const allowNonBoardMembers = $('#vote-allow-non-members').hasClass( + 'is-checked', + ); + const endString = this.currentCard.getVoteEnd(); + + this.currentCard.setVoteQuestion( + voteQuestion, + publicVote, + allowNonBoardMembers, + ); + if (endString) { + this.currentCard.setVoteEnd(endString); + } Popup.close(); }, + 'click .js-remove-vote': Popup.afterConfirm('deleteVote', () => { + event.preventDefault(); + this.currentCard.unsetVote(); + Popup.close(); + }), 'click a.js-toggle-vote-public'(event) { event.preventDefault(); $('#vote-public').toggleClass('is-checked'); }, + 'click a.js-toggle-vote-allow-non-members'(event) { + event.preventDefault(); + $('#vote-allow-non-members').toggleClass('is-checked'); + }, }, ]; }, }).register('cardStartVotingPopup'); +// editVoteEndDatePopup +(class extends DatePicker { + onCreated() { + super.onCreated(moment().format('YYYY-MM-DD HH:mm')); + this.data().getVoteEnd() && this.date.set(moment(this.data().getVoteEnd())); + } + events() { + return [ + { + 'submit .edit-date'(evt) { + evt.preventDefault(); + + // if no time was given, init with 12:00 + const time = + evt.target.time.value || + moment(new Date().setHours(12, 0, 0)).format('LT'); + + const dateString = `${evt.target.date.value} ${time}`; + const newDate = moment(dateString, 'L LT', true); + if (newDate.isValid()) { + // if active vote - store it + if (this.currentData().getVoteQuestion()) { + this._storeDate(newDate.toDate()); + Popup.close(); + } else { + this.currentData().vote = { end: newDate.toDate() }; // set vote end temp + Popup.back(); + } + } else { + this.error.set('invalid-date'); + evt.target.date.focus(); + } + }, + 'click .js-delete-date'(evt) { + evt.preventDefault(); + this._deleteDate(); + Popup.close(); + }, + }, + ]; + } + _storeDate(newDate) { + this.card.setVoteEnd(newDate); + } + _deleteDate() { + this.card.unsetVoteEnd(); + } +}.register('editVoteEndDatePopup')); + // Close the card details pane by pressing escape EscapeActions.register( 'detailsPane', diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 3e2beadd..12d0dda9 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -10,6 +10,9 @@ avatar-radius = 50% left: -2000px top: 0px +#clipboard + white-space: normal + .assignee border-radius: 3px display: block @@ -37,6 +40,8 @@ avatar-radius = 50% position: absolute &.avatar-image + object-fit: cover; + object-position: center; height: 100% width: @height @@ -337,6 +342,11 @@ card-details-color(background, color...) .vote-title display: flex justify-content: space-between + + .js-edit-date + align-self: baseline + margin-left: 5px + .vote-result display: flex .js-show-positive-votes diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index b6ccd4d7..79dd9127 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -103,7 +103,9 @@ template(name="minicard") if getVoteQuestion .badge.badge-state-image-only(title=getVoteQuestion) span.badge-icon.fa.fa-thumbs-up + span.badge-text {{ voteCountPositive }} span.badge-icon.fa.fa-thumbs-down + span.badge-text {{ voteCountNegative }} if attachments.count .badge span.badge-icon.fa.fa-paperclip diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 081c6521..0c2e3186 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -330,7 +330,7 @@ Template.viewer.events({ // the corresponding text). Clicking a link shouldn't fire these actions, stop // we stop these event at the viewer component level. 'click a'(event, templateInstance) { - let prevent = true; + const prevent = true; const userId = event.currentTarget.dataset.userid; if (userId) { Popup.open('member').call({ userId }, event, templateInstance); diff --git a/client/components/users/userAvatar.styl b/client/components/users/userAvatar.styl index b962b01c..8209f4a1 100644 --- a/client/components/users/userAvatar.styl +++ b/client/components/users/userAvatar.styl @@ -29,6 +29,8 @@ avatar-radius = 50% position: absolute &.avatar-image + object-fit: cover; + object-position: center; height: 100% width: @height diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 09e44620..04313159 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -152,8 +152,6 @@ "card-spent": "امضى وقتا", "card-edit-attachments": "تعديل المرفقات", "card-edit-custom-fields": "تعديل الحقل المعدل", - "card-start-voting": "ابدأ التصويت", - "card-cancel-voting": "حذف التصويت وجميع الأصوات", "card-edit-labels": "تعديل العلامات", "card-edit-members": "تعديل الأعضاء", "card-labels-title": "تعديل علامات البطاقة.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "ابدأ تصويت", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "مع", "vote-against": "ضد", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "حذف البطاقة ?", "cardDetailsActionsPopup-title": "إجراءات على البطاقة", "cardLabelsPopup-title": "علامات", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index ac8d80b9..68226d83 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Изработено време", "card-edit-attachments": "Промени прикачените файлове", "card-edit-custom-fields": "Промени собствените полета", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Промени етикетите", "card-edit-members": "Промени членовете", "card-labels-title": "Промени етикетите за картата.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Желаете да изтриете картата?", "cardDetailsActionsPopup-title": "Опции", "cardLabelsPopup-title": "Етикети", @@ -626,7 +628,7 @@ "r-when-a-card": "Когато карта", "r-is": "е", "r-is-moved": "преместена", - "r-added-to": "добавена в", + "r-added-to": "Added to", "r-removed-from": "премахната от", "r-the-board": "таблото", "r-list": "списък", diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 409a7a7d..c9e576ed 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Diverkañ ar gartenn ?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 8d549cc2..e70a4a26 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Temps Dedicat", "card-edit-attachments": "Edita arxius adjunts", "card-edit-custom-fields": "Editar camps personalitzats", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edita etiquetes", "card-edit-members": "Edita membres", "card-labels-title": "Canvia les etiquetes de la fitxa", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Esborrar fitxa?", "cardDetailsActionsPopup-title": "Accions de fitxes", "cardLabelsPopup-title": "Etiquetes", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index cb432bef..05d818d6 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Strávený čas", "card-edit-attachments": "Upravit přílohy", "card-edit-custom-fields": "Upravit vlastní pole", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Upravit štítky", "card-edit-members": "Upravit členy", "card-labels-title": "Změnit štítky karty.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Smazat kartu?", "cardDetailsActionsPopup-title": "Akce karty", "cardLabelsPopup-title": "Štítky", @@ -626,7 +628,7 @@ "r-when-a-card": "Pokud karta", "r-is": "je", "r-is-moved": "je přesunuto", - "r-added-to": "přidáno do", + "r-added-to": "Added to", "r-removed-from": "Odstraněno z", "r-the-board": "tablo", "r-list": "sloupce", diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json index d66d01aa..2f4df9d6 100644 --- a/i18n/da.i18n.json +++ b/i18n/da.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Anvendt tid", "card-edit-attachments": "Redigér vedhæftninger", "card-edit-custom-fields": "Redigér brugerdefinerede felter", - "card-start-voting": "Start stemmegivning", - "card-cancel-voting": "Slet stemmegivning og alle stemmer", "card-edit-labels": "Redigér etiketter", "card-edit-members": "Redigér medlemmer", "card-labels-title": "Ændr etiketter for kortet.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start en stemmeafgivning", "positiveVoteMembersPopup-title": "Tilhængere", "negativeVoteMembersPopup-title": "Modstandere", - "allowNonBoardMembers": "Tillad anonym stemmeafgivning på offentlige tavler", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Spørgsmål til afstemning", "vote-public": "Vis hvem som stemte hvad", "vote-for-it": "går ind for", "vote-against": "går imod", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Slet kort?", "cardDetailsActionsPopup-title": "Handlinger for kort", "cardLabelsPopup-title": "Etiketter", @@ -626,7 +628,7 @@ "r-when-a-card": "Når et kort", "r-is": "er", "r-is-moved": "flyttes", - "r-added-to": "tilføjes til", + "r-added-to": "Added to", "r-removed-from": "Fjernes fra", "r-the-board": "tavlen", "r-list": "liste", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index e2e14e76..687bf801 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Aufgewendete Zeit", "card-edit-attachments": "Anhänge ändern", "card-edit-custom-fields": "Benutzerdefinierte Felder editieren", - "card-start-voting": "Abstimmung starten", - "card-cancel-voting": "Abstimmung mit allen Stimmen löschen ", "card-edit-labels": "Labels ändern", "card-edit-members": "Mitglieder ändern", "card-labels-title": "Labels für diese Karte ändern.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Abstimmung starten", "positiveVoteMembersPopup-title": "Befürworter", "negativeVoteMembersPopup-title": "Gegner", - "allowNonBoardMembers": "Anonyme Abstimmung im öffentlichen Board zulassen", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Abstimmen über", "vote-public": "Zeigen, wer was gewählt hat", "vote-for-it": "Dafür", "vote-against": "Dagegen", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Karte löschen?", "cardDetailsActionsPopup-title": "Kartenaktionen", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "Wenn Karte", "r-is": "wird", "r-is-moved": "verschoben wird", - "r-added-to": "hinzugefügt zu", + "r-added-to": "Added to", "r-removed-from": "entfernt von", "r-the-board": "das Board", "r-list": "Liste", diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index 823e109b..3bc4f7f3 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Διαγραφή Κάρτας;", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Ετικέτες", @@ -626,7 +628,7 @@ "r-when-a-card": "Όταν μία κάρτα", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index e0540cb5..4458c5d3 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 67afccad..9fe7a521 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -652,7 +654,6 @@ "r-when-a-member": "When a member is", "r-when-the-member": "When the member", "r-name": "name", - "r-is": "is", "r-when-a-attach": "When an attachment", "r-when-a-checklist": "When a checklist is", "r-when-the-checklist": "When the checklist", @@ -666,7 +667,6 @@ "r-top-of": "Top of", "r-bottom-of": "Bottom of", "r-its-list": "its list", - "r-list": "list", "r-archive": "Move to Archive", "r-unarchive": "Restore from Archive", "r-card": "card", @@ -722,7 +722,6 @@ "r-swimlane-name": "swimlane name", "r-board-note": "Note: leave a field empty to match every possible value. ", "r-checklist-note": "Note: checklist's items have to be written as comma separated values.", - "r-added-to": "added to", "r-when-a-card-is-moved": "When a card is moved to another list", "r-set": "Set", "r-update": "Update", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 749c0a87..7bd1f27e 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Redakti etikedojn", "card-edit-members": "Redakti membrojn", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Etikedoj", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "listo", diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 94fabf76..2455623e 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Tiempo Empleado", "card-edit-attachments": "Editar adjuntos", "card-edit-custom-fields": "Editar campos personalizados", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editar etiquetas", "card-edit-members": "Editar miembros", "card-labels-title": "Cambiar las etiquetas de la tarjeta.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "¿Borrar Tarjeta?", "cardDetailsActionsPopup-title": "Acciones de la Tarjeta", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 5c779ba7..e84f98c1 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Tiempo consumido", "card-edit-attachments": "Editar los adjuntos", "card-edit-custom-fields": "Editar los campos personalizados", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editar las etiquetas", "card-edit-members": "Editar los miembros", "card-labels-title": "Cambia las etiquetas de la tarjeta", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Favorables", "negativeVoteMembersPopup-title": "Contrarios", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "contrarios", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "¿Eliminar la tarjeta?", "cardDetailsActionsPopup-title": "Acciones de la tarjeta", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "Cuando una tarjeta", "r-is": "es", "r-is-moved": "es movida", - "r-added-to": "agregada a", + "r-added-to": "Added to", "r-removed-from": "eliminado de", "r-the-board": "el tablero", "r-list": "la lista", diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 13aef143..82ef2da9 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Erabilitako denbora", "card-edit-attachments": "Editatu eranskinak", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editatu etiketak", "card-edit-members": "Editatu kideak", "card-labels-title": "Aldatu txartelaren etiketak", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Ezabatu txartela?", "cardDetailsActionsPopup-title": "Txartel-ekintzak", "cardLabelsPopup-title": "Etiketak", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index ebb76c25..bd50b8f1 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -152,8 +152,6 @@ "card-spent": "زمان صرف شده", "card-edit-attachments": "ویرایش ضمائم", "card-edit-custom-fields": "ویرایش فیلدهای شخصی", - "card-start-voting": "شروع رای گیری", - "card-cancel-voting": "حذف رای گیری و همه آرا", "card-edit-labels": "ویرایش برچسب", "card-edit-members": "ویرایش اعضا", "card-labels-title": "تغییر برچسب کارت", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "شروع به رای", "positiveVoteMembersPopup-title": "طرفداران", "negativeVoteMembersPopup-title": "مخالفان", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "سوال رای گیری", - "vote-public": "Show who voted what", + "vote-public": "نمایش چه کسی به چه رای داده است", "vote-for-it": "for it", - "vote-against": "against", + "vote-against": "بر خلاف", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "آیا می خواهید کارت را حذف کنید؟", "cardDetailsActionsPopup-title": "اعمال کارت", "cardLabelsPopup-title": "برچسب ها", @@ -329,7 +331,7 @@ "filter-clear": "حذف صافی ـ فیلتر ـ", "filter-no-label": "بدون برچسب", "filter-no-member": "بدون عضو", - "filter-no-assignee": "No assignee", + "filter-no-assignee": "الحاق نشده", "filter-no-custom-fields": "هیچ فیلدشخصی ای وجود ندارد", "filter-show-archive": "نمایش لیستهای آرشیو شده", "filter-hide-empty": "مخفی کردن لیستهای خالی", @@ -544,7 +546,7 @@ "new-outgoing-webhook": "New Outgoing Webhook", "no-name": "(ناشناخته)", "Node_version": "نسخه Node", - "Meteor_version": "Meteor version", + "Meteor_version": "نسخه متئور", "MongoDB_version": "ورژن MongoDB", "MongoDB_storage_engine": "موتور ذخیره سازی MongoDB", "MongoDB_Oplog_enabled": "MongoDB Oplog فعال", @@ -592,9 +594,9 @@ "default": "پیشفرض", "queue": "صف", "subtask-settings": "تنظیمات ریزکارها", - "card-settings": "Card Settings", + "card-settings": "تنظیمات کارت", "boardSubtaskSettingsPopup-title": "تنظیمات ریزکار های برد", - "boardCardSettingsPopup-title": "Card Settings", + "boardCardSettingsPopup-title": "تنظیمات کارت", "deposit-subtasks-board": "افزودن ریزکار به برد:", "deposit-subtasks-list": "لیست برای ریزکار های افزوده شده", "show-parent-in-minicard": "نمایش خانواده در ریز کارت", @@ -626,7 +628,7 @@ "r-when-a-card": "زمانی که کارت", "r-is": "هست", "r-is-moved": "جابهجا شده", - "r-added-to": "اضافه شد به", + "r-added-to": "Added to", "r-removed-from": "حذف از", "r-the-board": "برد", "r-list": "لیست", @@ -711,7 +713,7 @@ "r-board-note": "نکته: برای نمایش موارد ممکن کادر را خالی بگذارید.", "r-checklist-note": "نکته: چکلیستها باید توسط کاما از یکدیگر جدا شوند.", "r-when-a-card-is-moved": "زمانی که یک کارت به لیست دیگری منتقل شد", - "r-set": "Set", + "r-set": "تنظیم", "r-update": "به روز رسانی", "r-datefield": "تاریخ", "r-df-start-at": "شروع", @@ -761,12 +763,12 @@ "act-atUserComment": "You were mentioned in [__board__] __list__/__card__", "delete-user-confirm-popup": "Are you sure you want to delete this account? There is no undo.", "accounts-allowUserDelete": "Allow users to self delete their account", - "hide-minicard-label-text": "Hide minicard label text", + "hide-minicard-label-text": "مخفی کردن اسم برچسب مینی کارت", "show-desktop-drag-handles": "Show desktop drag handles", - "assignee": "Assignee", - "cardAssigneesPopup-title": "Assignee", - "addmore-detail": "Add a more detailed description", - "show-on-card": "Show on Card", + "assignee": "الحاق شده", + "cardAssigneesPopup-title": "الحاق شده", + "addmore-detail": "افزودن توضیحات کامل تر", + "show-on-card": "نمایش در کارت", "new": "جدید", "editUserPopup-title": "ویرایش کاربر", "newUserPopup-title": "کاربر جدید", @@ -775,14 +777,14 @@ "filter-by-unread": "فیلتر با خوانده نشده", "mark-all-as-read": "علامت همه به خوانده شده", "remove-all-read": "حذف همه خوانده شده", - "allow-rename": "Allow Rename", - "allowRenamePopup-title": "Allow Rename", - "start-day-of-week": "Set day of the week start", - "monday": "Monday", - "tuesday": "Tuesday", - "wednesday": "Wednesday", - "thursday": "Thursday", - "friday": "Friday", - "saturday": "Saturday", - "sunday": "Sunday" + "allow-rename": "اجازه تغییر نام", + "allowRenamePopup-title": "اجازه تغییر نام", + "start-day-of-week": "تنظیم روز شروع هفته", + "monday": "دوشنبه", + "tuesday": "سه شنبه", + "wednesday": "چهارشنبه", + "thursday": "پنجشنبه", + "friday": "جمعه", + "saturday": "شنبه", + "sunday": "یکشنبه" } diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index b0cc9742..31b294c1 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Käytetty aika", "card-edit-attachments": "Muokkaa liitetiedostoja", "card-edit-custom-fields": "Muokkaa mukautettuja kenttiä", - "card-start-voting": "Aloita äänestys", - "card-cancel-voting": "Poista äänestys ja kaikki äänet", "card-edit-labels": "Muokkaa nimilappuja", "card-edit-members": "Muokkaa jäseniä", "card-labels-title": "Muokkaa kortin nimilappuja.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Äänestä", "positiveVoteMembersPopup-title": "Kannattajat", "negativeVoteMembersPopup-title": "Vastustajat", - "allowNonBoardMembers": "Salli anonyymi äänestys julkisella taululla", + "card-edit-voting": "Muokkaa äänestystä", + "editVoteEndDatePopup-title": "Muokkaa äänestyksen loppumispäivää", + "allowNonBoardMembers": "Salli kaikki kirjautuneet käyttäjät", "vote-question": "Äänestys kysymys", "vote-public": "Näytä kuka äänesti mitäkin", "vote-for-it": "puolesta", "vote-against": "vastaan", + "deleteVotePopup-title": "Poista ääni?", + "vote-delete-pop": "Poistaminen on lopullista. Menetät kaikki tähän äänestykseen liitetyt toimet.", "cardDeletePopup-title": "Poista kortti?", "cardDetailsActionsPopup-title": "Korttitoimet", "cardLabelsPopup-title": "Nimilaput", @@ -626,7 +628,7 @@ "r-when-a-card": "Kun kortti", "r-is": "on", "r-is-moved": "on siirretty", - "r-added-to": "lisätty kohteeseen", + "r-added-to": "Lisätty kohteeseen", "r-removed-from": "Poistettu kohteesta", "r-the-board": "taulu", "r-list": "lista", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 01390d34..554aa6ae 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Temps passé", "card-edit-attachments": "Modifier les pièces jointes", "card-edit-custom-fields": "Éditer les champs personnalisés", - "card-start-voting": "Commencer le vote", - "card-cancel-voting": "Supprimer le vote", "card-edit-labels": "Gérer les étiquettes", "card-edit-members": "Gérer les participants", "card-labels-title": "Modifier les étiquettes de la carte.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Commencer un vote", "positiveVoteMembersPopup-title": "Pour", "negativeVoteMembersPopup-title": "Contre", - "allowNonBoardMembers": "Autoriser le vote anonyme sur le tableau public", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Question du vote", "vote-public": "Montrer qui a voté quoi", "vote-for-it": "pour", "vote-against": "contre", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Supprimer la carte ?", "cardDetailsActionsPopup-title": "Actions sur la carte", "cardLabelsPopup-title": "Étiquettes", @@ -626,7 +628,7 @@ "r-when-a-card": "Quand une carte", "r-is": "est", "r-is-moved": "est déplacée", - "r-added-to": "est ajoutée à", + "r-added-to": "Added to", "r-removed-from": "Supprimé de", "r-the-board": "tableau", "r-list": "liste", diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index e8cd865d..3badd7dd 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Editar anexos", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editar etiquetas", "card-edit-members": "Editar membros", "card-labels-title": "Cambiar as etiquetas da tarxeta.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index da268d6b..fc2d38ae 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -152,8 +152,6 @@ "card-spent": "זמן שהושקע", "card-edit-attachments": "עריכת קבצים מצורפים", "card-edit-custom-fields": "עריכת שדות בהתאמה אישית", - "card-start-voting": "ניתן להצביע", - "card-cancel-voting": "מחיקת אפשרות ההצבעה ואת כל הקולות", "card-edit-labels": "עריכת תוויות", "card-edit-members": "עריכת חברים", "card-labels-title": "שינוי תוויות לכרטיס.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "התחלת הצבעה", "positiveVoteMembersPopup-title": "תומכים", "negativeVoteMembersPopup-title": "יריבים", - "allowNonBoardMembers": "לאפשר הצבעות אלמוניות בלוח ציבורי", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "שאלת הסקר", "vote-public": "להציג מי הצביע למה", "vote-for-it": "בעד", "vote-against": "נגד", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "למחוק כרטיס?", "cardDetailsActionsPopup-title": "פעולות על הכרטיס", "cardLabelsPopup-title": "תוויות", @@ -626,7 +628,7 @@ "r-when-a-card": "כאשר כרטיס", "r-is": "הוא", "r-is-moved": "מועבר", - "r-added-to": "נוסף אל", + "r-added-to": "Added to", "r-removed-from": "מוסר מ־", "r-the-board": "הלוח", "r-list": "רשימה", diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json index 49aa9691..34a0c7ae 100644 --- a/i18n/hi.i18n.json +++ b/i18n/hi.i18n.json @@ -152,8 +152,6 @@ "card-spent": "समय बिताया", "card-edit-attachments": "संपादित संलग्नक", "card-edit-custom-fields": "संपादित प्रचलन क्षेत्र", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "संपादित नामपत्र", "card-edit-members": "संपादित सदस्य", "card-labels-title": "कार्ड के लिए नामपत्र परिवर्तित करें ।", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "मिटाएँ कार्ड?", "cardDetailsActionsPopup-title": "कार्ड क्रियाएँ", "cardLabelsPopup-title": "नामपत्र", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "हटा दिया from", "r-the-board": "the बोर्ड", "r-list": "list", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 44333d97..8a2821b2 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Eltöltött idő", "card-edit-attachments": "Mellékletek szerkesztése", "card-edit-custom-fields": "Egyéni mezők szerkesztése", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Címkék szerkesztése", "card-edit-members": "Tagok szerkesztése", "card-labels-title": "A kártya címkéinek megváltoztatása.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Törli a kártyát?", "cardDetailsActionsPopup-title": "Kártyaműveletek", "cardLabelsPopup-title": "Címkék", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 5fc9363a..983c7110 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 2509a5bc..3d2581fa 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Sunting lampiran", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Sunting label", "card-edit-members": "Sunting anggota", "card-labels-title": "Ubah label kartu", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Hapus kartu", "cardDetailsActionsPopup-title": "Aksi Kartu", "cardLabelsPopup-title": "Daftar Label", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 8eb436c0..c16115ee 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Aha", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 38796066..d5b510ae 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Tempo trascorso", "card-edit-attachments": "Modifica allegati", "card-edit-custom-fields": "Modifica campo personalizzato", - "card-start-voting": "Inizia a votare", - "card-cancel-voting": "Cancella votazione e tutti i voti", "card-edit-labels": "Modifica etichette", "card-edit-members": "Modifica membri", "card-labels-title": "Cambia le etichette per questa scheda.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Inizia una votazione", "positiveVoteMembersPopup-title": "Favorevoli", "negativeVoteMembersPopup-title": "Contrari", - "allowNonBoardMembers": "Consentire voto anonimo su bacheca pubblica", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Domanda di votazione", "vote-public": "Mostrare chi ha votato cosa", "vote-for-it": "a favore", "vote-against": "contro", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Elimina scheda?", "cardDetailsActionsPopup-title": "Azioni scheda", "cardLabelsPopup-title": "Etichette", @@ -626,7 +628,7 @@ "r-when-a-card": "Quando una scheda", "r-is": "è", "r-is-moved": "viene spostata", - "r-added-to": "Aggiunto/a a", + "r-added-to": "Added to", "r-removed-from": "Rimosso da", "r-the-board": "La bacheca", "r-list": "lista", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index ee4538ec..5c305b31 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -152,8 +152,6 @@ "card-spent": "作業時間", "card-edit-attachments": "添付ファイルの編集", "card-edit-custom-fields": "カスタムフィールドの編集", - "card-start-voting": "投票を開始", - "card-cancel-voting": "投票と全ての結果を削除", "card-edit-labels": "ラベルの編集", "card-edit-members": "メンバーの編集", "card-labels-title": "カードのラベルを変更する", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "投票を開始", "positiveVoteMembersPopup-title": "支持者", "negativeVoteMembersPopup-title": "反対者", - "allowNonBoardMembers": "公開ボードでの匿名投票を許可", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "投票の質問事項", "vote-public": "誰が何に投票したか表示", "vote-for-it": "賛成", "vote-against": "反対", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "カードを削除しますか？", "cardDetailsActionsPopup-title": "カード操作", "cardLabelsPopup-title": "ラベル", @@ -626,7 +628,7 @@ "r-when-a-card": "カード：", "r-is": "が", "r-is-moved": "が移動された時", - "r-added-to": "次に追加された時", + "r-added-to": "Added to", "r-removed-from": "次から削除された時", "r-the-board": "ボード：", "r-list": "リスト：", @@ -674,7 +676,7 @@ "r-of-checklist": "チェックリスト", "r-send-email": "メールを送る", "r-to": "宛先", - "r-of": "of", + "r-of": "/", "r-subject": "件名", "r-rule-details": "ルール詳細", "r-d-move-to-top-gen": "カードを自身のリストの先頭に移動", diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 0e266746..c8c2eaf9 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -152,8 +152,6 @@ "card-spent": "დახარჯული დრო", "card-edit-attachments": "მიბმული ფაილის შესწორება", "card-edit-custom-fields": "მომხმარებლის ველის შესწორება", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "ნიშნის შესწორება", "card-edit-members": "მომხმარებლების შესწორება", "card-labels-title": "ნიშნის შეცვლა ბარათისთვის.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "წავშალოთ ბარათი? ", "cardDetailsActionsPopup-title": "ბარათის მოქმედებები", "cardLabelsPopup-title": "ნიშნები", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index cb8aa4f9..80eeb598 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index c36e3baa..17066e44 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "첨부 파일 수정", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "라벨 수정", "card-edit-members": "멤버 수정", "card-labels-title": "카드의 라벨 변경.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "카드를 삭제합니까?", "cardDetailsActionsPopup-title": "카드 액션", "cardLabelsPopup-title": "라벨", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index df33588e..669dc605 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json index 2a6f964b..0f2dd63e 100644 --- a/i18n/mk.i18n.json +++ b/i18n/mk.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Изработено време", "card-edit-attachments": "Промени прикачените датотеки", "card-edit-custom-fields": "Промени собствените полета", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Промени етикетите", "card-edit-members": "Промени членовете", "card-labels-title": "Промени етикетите за картата.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Желаете да изтриете картата?", "cardDetailsActionsPopup-title": "Опции", "cardLabelsPopup-title": "Етикети", @@ -626,7 +628,7 @@ "r-when-a-card": "Когато карта", "r-is": "е", "r-is-moved": "преместена", - "r-added-to": "добавена в", + "r-added-to": "Added to", "r-removed-from": "премахната от", "r-the-board": "таблото", "r-list": "списък", diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index f3256a6c..0bddd870 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 578520bd..418b31fc 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Rediger vedlegg", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Rediger etiketter", "card-edit-members": "Endre medlemmer", "card-labels-title": "Endre etiketter for kortet.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Slett kort?", "cardDetailsActionsPopup-title": "Kort-handlinger", "cardLabelsPopup-title": "Etiketter", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 4a4ad0bc..04c18fd7 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Gespendeerde tijd", "card-edit-attachments": "Wijzig bijlagen", "card-edit-custom-fields": "Wijzig maatwerkvelden", - "card-start-voting": "Start stemming", - "card-cancel-voting": "Verwijder stemming en verwijder stemmen", "card-edit-labels": "Wijzig labels", "card-edit-members": "Wijzig leden", "card-labels-title": "Wijzig de labels van de kaart.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start een stemming", "positiveVoteMembersPopup-title": "Voorstanders", "negativeVoteMembersPopup-title": "Tegenstanders", - "allowNonBoardMembers": "Sta anoniem stemmen toe op openbaar bord", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Stemvraag", "vote-public": "Toon wie wat gestemd heeft", "vote-for-it": "Voor", "vote-against": "tegen", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Kaart verwijderen?", "cardDetailsActionsPopup-title": "Kaart actie ondernemen", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "Als een kaart", "r-is": "is", "r-is-moved": "is verplaatst", - "r-added-to": "toegevoegd aan", + "r-added-to": "Added to", "r-removed-from": "verwijderd van", "r-the-board": "het bord", "r-list": "lijst", diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json index 17c9ebca..aa46954f 100644 --- a/i18n/oc.i18n.json +++ b/i18n/oc.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Temps passat", "card-edit-attachments": "Cambiar las pèças jonchas", "card-edit-custom-fields": "Cambiar los camps personalizats", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Cambiar los labèls", "card-edit-members": "Cambiar los participants", "card-labels-title": "Cambiar l'etiqueta de la carta.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Suprimir la carta?", "cardDetailsActionsPopup-title": "Accions sus la carta", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 449ae3aa..fd6281e8 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spędzony czas", "card-edit-attachments": "Edytuj załączniki", "card-edit-custom-fields": "Edytuj niestandardowe pola", - "card-start-voting": "Rozpocznij głosowanie", - "card-cancel-voting": "Usuń głosowanie i wszystkie głosy", "card-edit-labels": "Edytuj etykiety", "card-edit-members": "Edytuj członków", "card-labels-title": "Zmień etykiety karty", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Zacznij głosowanie", "positiveVoteMembersPopup-title": "Zwolennicy", "negativeVoteMembersPopup-title": "Przeciwnicy", - "allowNonBoardMembers": "Pozwól na oddawanie anonimowych głosów na publicznej tablicy", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Pytanie do głosowania", "vote-public": "Pokaż, kto głosował na wybrane opcje", "vote-for-it": "za", "vote-against": "przeciwko", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Usunąć kartę?", "cardDetailsActionsPopup-title": "Czynności kart", "cardLabelsPopup-title": "Etykiety", @@ -626,7 +628,7 @@ "r-when-a-card": "Gdy karta", "r-is": "jest", "r-is-moved": "jest przenoszona", - "r-added-to": "dodana do", + "r-added-to": "Added to", "r-removed-from": "usunął z", "r-the-board": "tablicy", "r-list": "lista", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 70c7cccf..db8cdf27 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Tempo Gasto", "card-edit-attachments": "Editar anexos", "card-edit-custom-fields": "Editar campos customizados", - "card-start-voting": "Iniciar votação", - "card-cancel-voting": "Excluir votação e todos os votos", "card-edit-labels": "Editar etiquetas", "card-edit-members": "Editar membros", "card-labels-title": "Alterar etiquetas do cartão.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Iniciar uma votação", "positiveVoteMembersPopup-title": "Proponentes", "negativeVoteMembersPopup-title": "Oponentes", - "allowNonBoardMembers": "Permitir voto anônimo em quadro público", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Questão em votação", "vote-public": "Mostrar quem votou no quê", "vote-for-it": "a favor", "vote-against": "contra", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Excluir Cartão?", "cardDetailsActionsPopup-title": "Ações do cartão", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "Quando um cartão", "r-is": "é", "r-is-moved": "é movido", - "r-added-to": "adicionado à", + "r-added-to": "Added to", "r-removed-from": "Removido de", "r-the-board": "o quadro", "r-list": "lista", diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 93a600f1..0ead762e 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Tempo Gasto", "card-edit-attachments": "Editar anexos", "card-edit-custom-fields": "Editar campos personalizados", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editar etiquetas", "card-edit-members": "Editar membros", "card-labels-title": "Alterar as etiquetas do cartão.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Apagar Cartão?", "cardDetailsActionsPopup-title": "Acções do Cartão", "cardLabelsPopup-title": "Etiquetas", @@ -626,7 +628,7 @@ "r-when-a-card": "Quando um cartão", "r-is": "é", "r-is-moved": "é movido", - "r-added-to": "adicionado a", + "r-added-to": "Added to", "r-removed-from": "Removido de", "r-the-board": "o quadro", "r-list": "lista", diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index c791357d..b7a74e13 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Editează atașamente", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Editează etichete", "card-edit-members": "Editează membrii", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 16458866..f6611b33 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Затраченное время", "card-edit-attachments": "Изменить вложения", "card-edit-custom-fields": "Редактировать настраиваемые поля", - "card-start-voting": "Запустить голосование", - "card-cancel-voting": "Отменить голосование и удалить голоса", "card-edit-labels": "Изменить метку", "card-edit-members": "Изменить участников", "card-labels-title": "Изменить метки для этой карточки.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Голосовать", "positiveVoteMembersPopup-title": "Сторонники", "negativeVoteMembersPopup-title": "Противники", - "allowNonBoardMembers": "Разрешить анонимное голосование на доступной всем доске", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Вопрос для голосования", "vote-public": "Показать кто как голосовал", "vote-for-it": "за", "vote-against": "против", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Удалить карточку?", "cardDetailsActionsPopup-title": "Действия в карточке", "cardLabelsPopup-title": "Метки", @@ -626,7 +628,7 @@ "r-when-a-card": "Когда карточка", "r-is": " ", "r-is-moved": "перемещается", - "r-added-to": "добавляется в", + "r-added-to": "Added to", "r-removed-from": "Покидает", "r-the-board": "доску", "r-list": "список", diff --git a/i18n/sl.i18n.json b/i18n/sl.i18n.json index b07930c4..49b07077 100644 --- a/i18n/sl.i18n.json +++ b/i18n/sl.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Porabljen čas", "card-edit-attachments": "Uredi priponke", "card-edit-custom-fields": "Uredi poljubna polja", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Uredi oznake", "card-edit-members": "Uredi člane", "card-labels-title": "Spremeni oznake za kartico.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Briši kartico?", "cardDetailsActionsPopup-title": "Dejanja kartice", "cardLabelsPopup-title": "Oznake", @@ -626,7 +628,7 @@ "r-when-a-card": "Ko je kartica", "r-is": " ", "r-is-moved": "premaknjena", - "r-added-to": "dodan na", + "r-added-to": "Added to", "r-removed-from": "izbrisan iz", "r-the-board": "tabla", "r-list": "seznam", diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index b0d9638b..d3b35967 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Uredi priloge", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Započni glasanje", - "card-cancel-voting": "Obriši glasanje i sve glasove", "card-edit-labels": "Uredi natpise", "card-edit-members": "Uredi članove", "card-labels-title": "Promeni natpis na kartici.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Novo glasanje", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Pitanje za glasanje", "vote-public": "Show who voted what", "vote-for-it": "za", "vote-against": "protiv", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Obrisati karticu?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Oznake", @@ -626,7 +628,7 @@ "r-when-a-card": "Kada kartica", "r-is": "je", "r-is-moved": "je premeštena", - "r-added-to": "dodata u", + "r-added-to": "Added to", "r-removed-from": "Uklonjena iz", "r-the-board": "table", "r-list": "liste", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 97a7b1f1..4ba2a277 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -64,7 +64,7 @@ "activity-unchecked-item": "okryssad %s i checklistan %s av %s", "activity-checklist-added": "lade kontrollista till %s", "activity-checklist-removed": "tog bort en checklista från %s", - "activity-checklist-completed": "completed checklist %s of %s", + "activity-checklist-completed": "slutförde checklista %s av %s", "activity-checklist-uncompleted": "inte slutfört checklistan %s av %s", "activity-checklist-item-added": "lade checklista objekt till '%s' i %s", "activity-checklist-item-removed": "tog bort en checklista objekt från \"%s\" i %s", @@ -126,7 +126,7 @@ "board-nb-stars": "%s stjärnor", "board-not-found": "Anslagstavla hittades inte", "board-private-info": "Denna anslagstavla kommer att vara <strong>privat</strong>.", - "board-public-info": "Denna anslagstavla kommer att vara <strong>officiell</strong>.", + "board-public-info": "Denna anslagstavla kommer att vara <strong>publik</strong>.", "boardChangeColorPopup-title": "Ändra bakgrund på anslagstavla", "boardChangeTitlePopup-title": "Byt namn på anslagstavla", "boardChangeVisibilityPopup-title": "Ändra synlighet", @@ -152,8 +152,6 @@ "card-spent": "Spenderad tid", "card-edit-attachments": "Redigera bilaga", "card-edit-custom-fields": "Redigera anpassade fält", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Redigera etiketter", "card-edit-members": "Redigera medlemmar", "card-labels-title": "Ändra etiketter för kortet.", @@ -163,14 +161,18 @@ "cardAttachmentsPopup-title": "Bifoga från", "cardCustomField-datePopup-title": "Ändra datum", "cardCustomFieldsPopup-title": "Redigera anpassade fält", - "cardStartVotingPopup-title": "Start a vote", - "positiveVoteMembersPopup-title": "Proponents", - "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", - "vote-question": "Voting question", - "vote-public": "Show who voted what", - "vote-for-it": "for it", - "vote-against": "against", + "cardStartVotingPopup-title": "Påbörja en omröstning", + "positiveVoteMembersPopup-title": "Förespråkare", + "negativeVoteMembersPopup-title": "Opponenter", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", + "vote-question": "Omröstningsfråga", + "vote-public": "Visa vem som röstade på vad", + "vote-for-it": "för", + "vote-against": "emot", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Ta bort kort?", "cardDetailsActionsPopup-title": "Kortåtgärder", "cardLabelsPopup-title": "Etiketter", @@ -234,7 +236,7 @@ "no-comments": "Inga kommentarer", "no-comments-desc": "Kan inte se kommentarer och aktiviteter.", "worker": "Worker", - "worker-desc": "Can only move cards, assign itself to card and comment.", + "worker-desc": "Kan endast flytta kort, tilldela sig kort och kommentera.", "computer": "Dator", "confirm-subtask-delete-dialog": "Är du säker på att du vill radera deluppgift?", "confirm-checklist-delete-dialog": "Är du säker på att du vill radera checklista?", @@ -319,8 +321,8 @@ "list-sort-by": "Sortera listan efter:", "list-label-modifiedAt": "Sista åtkomsttid", "list-label-title": "Namn på listan", - "list-label-sort": "Your Manual Order", - "list-label-short-modifiedAt": "(L)", + "list-label-sort": "Din Manuella Ordning", + "list-label-short-modifiedAt": "(S)", "list-label-short-title": "(N)", "list-label-short-sort": "(M)", "filter": "Filtrera", @@ -329,7 +331,7 @@ "filter-clear": "Rensa filter", "filter-no-label": "Ingen etikett", "filter-no-member": "Ingen medlem", - "filter-no-assignee": "No assignee", + "filter-no-assignee": "Inte tilldelad någon", "filter-no-custom-fields": "Inga anpassade fält", "filter-show-archive": "Visa arkiverade listor", "filter-hide-empty": "Dölj tomma listor", @@ -449,7 +451,7 @@ "save": "Spara", "search": "Sök", "rules": "Regler", - "search-cards": "Search from card/list titles, descriptions and custom fields on this board", + "search-cards": "Sök i kort- och listtitlar, beskrivningar och anpassade fält på denna anslagstavla", "search-example": "Text att söka efter?", "select-color": "Välj färg", "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan", @@ -536,7 +538,7 @@ "webhook-title": "Namn på webhook", "webhook-token": "Token (valfritt för autentisering)", "outgoing-webhooks": "Utgående Webhookar", - "bidirectional-webhooks": "Two-Way Webhooks", + "bidirectional-webhooks": "Dubbelriktade Webhookar", "outgoingWebhooksPopup-title": "Utgående Webhookar", "boardCardTitlePopup-title": "Korttitelfiler", "disable-webhook": "Avaktivera denna webhook", @@ -626,7 +628,7 @@ "r-when-a-card": "När ett kort", "r-is": "är", "r-is-moved": "är flyttad", - "r-added-to": "tillagd till", + "r-added-to": "Added to", "r-removed-from": "Borttagen från", "r-the-board": "anslagstavlan", "r-list": "lista", @@ -674,7 +676,7 @@ "r-of-checklist": "av checklistan", "r-send-email": "Skicka ett e-postmeddelande", "r-to": "till", - "r-of": "of", + "r-of": "av", "r-subject": "änme", "r-rule-details": "Regeldetaljer", "r-d-move-to-top-gen": "Flytta kort till toppen av sin lista", @@ -770,19 +772,19 @@ "new": "Ny", "editUserPopup-title": "Redigera användare", "newUserPopup-title": "Ny användare", - "notifications": "Notifications", - "view-all": "View All", - "filter-by-unread": "Filter by Unread", - "mark-all-as-read": "Mark all as read", - "remove-all-read": "Remove all read", - "allow-rename": "Allow Rename", - "allowRenamePopup-title": "Allow Rename", - "start-day-of-week": "Set day of the week start", - "monday": "Monday", - "tuesday": "Tuesday", - "wednesday": "Wednesday", - "thursday": "Thursday", - "friday": "Friday", - "saturday": "Saturday", - "sunday": "Sunday" + "notifications": "Notifieringar", + "view-all": "Visa Allt", + "filter-by-unread": "Filtrera efter Oläst", + "mark-all-as-read": "Markera alla som lästa", + "remove-all-read": "Ta bort alla lästa", + "allow-rename": "Tillåt Namnändring", + "allowRenamePopup-title": "Tillåt Namnändring", + "start-day-of-week": "Ange veckans första dag", + "monday": "Måndag", + "tuesday": "Tisdag", + "wednesday": "Onsdag", + "thursday": "Torsdag", + "friday": "Fredag", + "saturday": "Lördag", + "sunday": "Söndag" } diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json index 242b3f17..76bfb09f 100644 --- a/i18n/sw.i18n.json +++ b/i18n/sw.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Muda uliotumika", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index dd66c13e..c75700ba 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index dad60012..4b571a49 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "แก้ไขสิ่งที่แนบมา", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "แก้ไขป้ายกำกับ", "card-edit-members": "แก้ไขสมาชิก", "card-labels-title": "เปลี่ยนป้ายกำกับของการ์ด", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "ลบการ์ดนี้หรือไม่", "cardDetailsActionsPopup-title": "การดำเนินการการ์ด", "cardLabelsPopup-title": "ป้ายกำกับ", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 657b4dcf..1e5d7ad2 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Harcanan Zaman", "card-edit-attachments": "Ek dosyasını düzenle", "card-edit-custom-fields": "Özel alanları düzenle", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Etiketleri düzenle", "card-edit-members": "Üyeleri düzenle", "card-labels-title": "Bu kart için etiketleri düzenle", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Kart Silinsin mi?", "cardDetailsActionsPopup-title": "Kart işlemleri", "cardLabelsPopup-title": "Etiketler", @@ -626,7 +628,7 @@ "r-when-a-card": "Kart eklendiğinde", "r-is": "is", "r-is-moved": "taşındı", - "r-added-to": "eklendi", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "pano", "r-list": "liste", diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 2938ee8f..3246eaa2 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Витрачено часу", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Редагувати мітки", "card-edit-members": "Редагувати учасників", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Видалити картку?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Видалити з", "r-the-board": "Дошка", "r-list": "list", diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index a3ec456a..466c937e 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 6c821ee1..7665fbfd 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -152,8 +152,6 @@ "card-spent": "耗时", "card-edit-attachments": "编辑附件", "card-edit-custom-fields": "编辑自定义字段", - "card-start-voting": "开始投票", - "card-cancel-voting": "移除投票", "card-edit-labels": "编辑标签", "card-edit-members": "编辑成员", "card-labels-title": "更改该卡片上的标签", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "建立投票", "positiveVoteMembersPopup-title": "支持", "negativeVoteMembersPopup-title": "反对", - "allowNonBoardMembers": "允许任何人在公开看板投票", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "投票题目", "vote-public": "查看投票结果", "vote-for-it": "同意", "vote-against": "反对", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "彻底删除卡片？", "cardDetailsActionsPopup-title": "卡片操作", "cardLabelsPopup-title": "标签", @@ -626,7 +628,7 @@ "r-when-a-card": "当一张卡片", "r-is": "是", "r-is-moved": "已经移动", - "r-added-to": "添加到", + "r-added-to": "Added to", "r-removed-from": "已移除", "r-the-board": "该看板", "r-list": "列表", diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json index 6adb1d7e..3fa93f10 100644 --- a/i18n/zh-HK.i18n.json +++ b/i18n/zh-HK.i18n.json @@ -152,8 +152,6 @@ "card-spent": "Spent Time", "card-edit-attachments": "Edit attachments", "card-edit-custom-fields": "Edit custom fields", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", "card-labels-title": "Change the labels for the card.", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "Start a vote", "positiveVoteMembersPopup-title": "Proponents", "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "Voting question", "vote-public": "Show who voted what", "vote-for-it": "for it", "vote-against": "against", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", "cardLabelsPopup-title": "Labels", @@ -626,7 +628,7 @@ "r-when-a-card": "When a card", "r-is": "is", "r-is-moved": "is moved", - "r-added-to": "added to", + "r-added-to": "Added to", "r-removed-from": "Removed from", "r-the-board": "the board", "r-list": "list", diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 232193b7..87fc574b 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -152,8 +152,6 @@ "card-spent": "耗時", "card-edit-attachments": "編輯附件", "card-edit-custom-fields": "編輯自訂欄位", - "card-start-voting": "開始投票", - "card-cancel-voting": "移除投票", "card-edit-labels": "編輯標籤", "card-edit-members": "編輯成員", "card-labels-title": "更改該卡片上的標籤", @@ -166,11 +164,15 @@ "cardStartVotingPopup-title": "建立投票", "positiveVoteMembersPopup-title": "支持", "negativeVoteMembersPopup-title": "反對", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "card-edit-voting": "Edit voting", + "editVoteEndDatePopup-title": "Change vote end date", + "allowNonBoardMembers": "Allow all logged in users", "vote-question": "投票題目", "vote-public": "Show who voted what", "vote-for-it": "同意", "vote-against": "反對", + "deleteVotePopup-title": "Delete vote?", + "vote-delete-pop": "Deleting is permanent. You will lose all actions associated with this vote.", "cardDeletePopup-title": "徹底刪除卡片？", "cardDetailsActionsPopup-title": "卡片操作", "cardLabelsPopup-title": "標籤", @@ -626,7 +628,7 @@ "r-when-a-card": "當一張卡片", "r-is": "是", "r-is-moved": "已經移動", - "r-added-to": "新增到", + "r-added-to": "Added to", "r-removed-from": "已移除", "r-the-board": "該看板", "r-list": "清單", diff --git a/models/cards.js b/models/cards.js index 4197f7ab..223677f1 100644 --- a/models/cards.js +++ b/models/cards.js @@ -340,6 +340,10 @@ Cards.attachSchema( type: Boolean, defaultValue: false, }, + 'vote.allowNonBoardMembers': { + type: Boolean, + defaultValue: false, + }, }), ); @@ -347,8 +351,14 @@ Cards.allow({ insert(userId, doc) { return allowIsBoardMember(userId, Boards.findOne(doc.boardId)); }, - update(userId, doc) { - return allowIsBoardMember(userId, Boards.findOne(doc.boardId)); + + update(userId, doc, fields) { + // Allow board members or logged in users if only vote get's changed + return ( + allowIsBoardMember(userId, Boards.findOne(doc.boardId)) || + (_.isEqual(fields, ['vote', 'modifiedAt', 'dateLastActivity']) && + !!userId) + ); }, remove(userId, doc) { return allowIsBoardMember(userId, Boards.findOne(doc.boardId)); @@ -1048,6 +1058,29 @@ Cards.helpers({ } }, + getVoteEnd() { + if (this.isLinkedCard()) { + const card = Cards.findOne({ _id: this.linkedId }); + if (card && card.vote) return card.vote.end; + else return null; + } else if (this.isLinkedBoard()) { + const board = Boards.findOne({ _id: this.linkedId }); + if (board && board.vote) return board.vote.end; + else return null; + } else if (this.vote) { + return this.vote.end; + } else { + return null; + } + }, + expiredVote() { + let end = this.getVoteEnd(); + if (end) { + end = moment(end); + return end.isBefore(new Date()); + } + return false; + }, voteMemberPositive() { if (this.vote && this.vote.positive) return Users.find({ _id: { $in: this.vote.positive } }); @@ -1153,6 +1186,26 @@ Cards.helpers({ isTemplateCard() { return this.type === 'template-card'; }, + + votePublic() { + if (this.vote) return this.vote.public; + return null; + }, + voteAllowNonBoardMembers() { + if (this.vote) return this.vote.allowNonBoardMembers; + return null; + }, + voteCountNegative() { + if (this.vote && this.vote.negative) return this.vote.negative.length; + return null; + }, + voteCountPositive() { + if (this.vote && this.vote.positive) return this.vote.positive.length; + return null; + }, + voteCount() { + return this.voteCountPositive() + this.voteCountNegative(); + }, }); Cards.mutations({ @@ -1476,12 +1529,13 @@ Cards.mutations({ }, }; }, - setVoteQuestion(question, publicVote) { + setVoteQuestion(question, publicVote, allowNonBoardMembers) { return { $set: { vote: { question, public: publicVote, + allowNonBoardMembers, positive: [], negative: [], }, @@ -1495,6 +1549,16 @@ Cards.mutations({ }, }; }, + setVoteEnd(end) { + return { + $set: { 'vote.end': end }, + }; + }, + unsetVoteEnd() { + return { + $unset: { 'vote.end': '' }, + }; + }, setVote(userId, forIt) { switch (forIt) { case true: @@ -2156,7 +2220,7 @@ if (Meteor.isServer) { const check = Users.findOne({ _id: req.body.authorId, }); - const members = req.body.members || [req.body.authorId]; + const members = req.body.members; const assignees = req.body.assignees; if (typeof check !== 'undefined') { const id = Cards.direct.insert({ diff --git a/models/users.js b/models/users.js index a1bc5b0f..1a021bb7 100644 --- a/models/users.js +++ b/models/users.js @@ -1240,6 +1240,25 @@ if (Meteor.isServer) { Authentication.checkLoggedIn(req.userId); const data = Meteor.users.findOne({ _id: req.userId }); delete data.services; + + // get all boards where the user is member of + let boards = Boards.find( + { + type: 'board', + 'members.userId': req.userId, + }, + { + fields: { _id: 1, members: 1 }, + }, + ); + boards = boards.map(b => { + const u = b.members.find(m => m.userId === req.userId); + delete u.userId; + u.boardId = b._id; + return u; + }); + + data.boards = boards; JsonRoutes.sendResult(res, { code: 200, data, @@ -1292,9 +1311,29 @@ if (Meteor.isServer) { try { Authentication.checkUserId(req.userId); const id = req.params.userId; + + // get all boards where the user is member of + let boards = Boards.find( + { + type: 'board', + 'members.userId': id, + }, + { + fields: { _id: 1, members: 1 }, + }, + ); + boards = boards.map(b => { + const u = b.members.find(m => m.userId === id); + delete u.userId; + u.boardId = b._id; + return u; + }); + + const user = Meteor.users.findOne({ _id: id }); + user.boards = boards; JsonRoutes.sendResult(res, { code: 200, - data: Meteor.users.findOne({ _id: id }), + data: user, }); } catch (error) { JsonRoutes.sendResult(res, { diff --git a/package-lock.json b/package-lock.json index ad8f79c1..93ab5e39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,18 +13,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -33,12 +33,57 @@ "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/generator": { "version": "7.9.5", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, "requires": { "@babel/types": "^7.9.5", "jsesc": "^2.5.1", @@ -103,14 +148,58 @@ } }, "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-simple-access": { @@ -136,13 +225,57 @@ "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" }, "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", "requires": { "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/highlight": { @@ -161,9 +294,9 @@ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -182,6 +315,7 @@ "version": "7.9.5", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, "requires": { "@babel/code-frame": "^7.8.3", "@babel/generator": "^7.9.5", @@ -204,6 +338,11 @@ "to-fast-properties": "^2.0.0" } }, + "@root/request": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@root/request/-/request-1.6.1.tgz", + "integrity": "sha512-8wrWyeBLRp7T8J36GkT3RODJ6zYmL0/maWlAUD5LOXT28D3TDquUepyYDKYANNA3Gc8R5ZCgf+AXvSTYpJEWwQ==" + }, "@samverschueren/stream-to-observable": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", @@ -3302,9 +3441,9 @@ "optional": true }, "mongodb": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.6.tgz", - "integrity": "sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz", + "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==", "requires": { "bl": "^2.2.0", "bson": "^1.1.4", @@ -3977,9 +4116,9 @@ "dev": true }, "qs": { - "version": "6.9.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", - "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" }, "rc": { "version": "1.2.8", @@ -4394,9 +4533,9 @@ } }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" diff --git a/package.json b/package.json index 94b0f5a0..0f97d09a 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,9 @@ "prettier-eslint": "^9.0.1" }, "dependencies": { - "@babel/core": "^7.9.0", - "@babel/runtime": "^7.9.2", + "@babel/core": "^7.9.6", + "@babel/runtime": "^7.9.6", + "@root/request": "^1.6.1", "ajv": "^5.0.0", "babel-runtime": "^6.26.0", "bcrypt": "^3.0.7", @@ -67,12 +68,12 @@ "gridfs-stream": "^0.5.3", "ldapjs": "^1.0.2", "meteor-node-stubs": "^0.4.1", - "mongodb": "^3.5.0", + "mongodb": "^3.5.7", "os": "^0.1.1", "page": "^1.11.5", + "qs": "^6.9.4", + "source-map-support": "^0.5.19", "papaparse": "^5.2.0", - "qs": "^6.9.1", - "source-map-support": "^0.5.16", "xss": "^1.0.6" } } diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 1655d8f7..b058a6c9 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -64,7 +64,7 @@ function npm_call(){ echo PS3='Please enter your choice: ' -options=("Install Wekan dependencies" "Build Wekan" "Quit") +options=("Install Wekan dependencies" "Build Wekan" "Run Meteor for development on Ethernet IP address port 4000" "Run Meteor for development on Custom IP address and port" "Quit") select opt in "${options[@]}" do case $opt in @@ -106,18 +106,19 @@ do exit; fi - ## Latest npm with Meteor 1.8.x - npm_call -g install npm - npm_call -g install node-gyp - # Latest fibers for Meteor 1.8.x + ## Latest npm with Meteor 1.8.x + npm_call -g install npm + npm_call -g install node-gyp + # Latest fibers for Meteor 1.8.x sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp - npm_call -g install fibers - # Install Meteor, if it's not yet installed - curl https://install.meteor.com | bash + npm_call -g install fibers + # Install Meteor, if it's not yet installed + curl https://install.meteor.com | bash sudo chown -R $(id -u):$(id -g) $HOME/.npm $HOME/.meteor break ;; - "Build Wekan") + + "Build Wekan") echo "Building Wekan." #wekan_repo_check # REPOS BELOW ARE INCLUDED TO WEKAN REPO @@ -148,7 +149,7 @@ do rm -rf .build meteor build .build --directory cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc. + # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc. rm -rf .build/bundle/programs/web.browser.legacy #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac @@ -164,9 +165,26 @@ do echo Done. break ;; - "Quit") + + "Run Meteor for development on Ethernet IP address port 4000") + IPADDRESS=$(ip addr show enp2s0 | grep 'inet ' | cut -d: -f2 | awk '{ print $2}' | cut -d '/' -f 1) + WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + break + ;; + + "Run Meteor for development on Custom IP address and port") + ip address + echo "From above list, what is your IP address?" + read IPADDRESS + echo "On what port you would like to run Wekan?" + read PORT + WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:$PORT meteor run --exclude-archs web.browser.legacy,web.cordova --port $PORT + break + ;; + + "Quit") break - ;; - *) echo invalid option;; + ;; + *) echo invalid option;; esac done diff --git a/sandstorm.js b/sandstorm.js index 8615e419..de386d14 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -22,7 +22,7 @@ const sandstormBoard = { if (isSandstorm && Meteor.isServer) { const fs = require('fs'); - const Capnp = Npm.require(`capnp`); + const Capnp = Npm.require('capnp'); const Package = Capnp.importSystem('sandstorm/package.capnp'); const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp'); const Identity = Capnp.importSystem('sandstorm/identity.capnp'); |