From c4fa9010f34966b633c7bf7e46ad49fc101127c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Tue, 27 Feb 2018 13:51:47 -0300 Subject: Avoid swimlane title overlap --- client/components/swimlanes/swimlanes.styl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index fcc5d962..8f43ef58 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -4,12 +4,13 @@ display: flex; flex-direction: row; flex: 0 0 50px; + padding-bottom: 30px; .swimlane-header writing-mode: sideways-lr; font-size: 14px; line-height: 50px; - margin: 0; + margin-top: 50px; font-weight: bold; min-height: 9px; min-width: 30px; -- cgit v1.2.3-1-g7c22 From 37c94622e476f50bf2387bc8b140454d66200e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Tue, 27 Feb 2018 20:11:43 -0300 Subject: Allow swimlanes reordering --- client/components/boards/boardBody.jade | 2 +- client/components/boards/boardBody.styl | 9 ---- client/components/swimlanes/swimlaneHeader.jade | 4 +- client/components/swimlanes/swimlanes.jade | 2 +- client/components/swimlanes/swimlanes.js | 39 ++++++++++++++ client/components/swimlanes/swimlanes.styl | 69 +++++++++++++++++-------- 6 files changed, 91 insertions(+), 34 deletions(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 30e70b31..dd71857a 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -14,7 +14,7 @@ template(name="board") template(name="boardBody") .board-wrapper(class=currentBoard.colorClass) +sidebar - .board-canvas( + .board-canvas.js-swimlanes( class="{{#if Sidebar.isOpen}}is-sibling-sidebar-open{{/if}}" class="{{#if MultiSelection.isActive}}is-multiselection-active{{/if}}" class="{{#if draggingActive.get}}is-dragging-active{{/if}}") diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl index 359aaf96..e56df352 100644 --- a/client/components/boards/boardBody.styl +++ b/client/components/boards/boardBody.styl @@ -23,15 +23,6 @@ position() &.is-sibling-sidebar-open margin-right: 248px - .swimlane - border-bottom: 1px solid #CCC - display: flex - flex-direction: row - margin: 0 0 10px - padding: 0 40px 5px 0 - overflow-x: auto - overflow-y: hidden - .board-overlay position: fixed-cover top: -100px diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade index 49193a81..483de06f 100644 --- a/client/components/swimlanes/swimlaneHeader.jade +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -1,5 +1,5 @@ template(name="swimlaneHeader") - .swimlane-header-wrap + .swimlane-header-wrap.js-swimlane-header +inlinedForm +editSwimlaneTitleForm else @@ -9,7 +9,7 @@ template(name="swimlaneHeader") .swimlane-header-menu unless currentUser.isCommentOnly a.fa.fa-navicon.js-open-swimlane-menu - + template(name="editSwimlaneTitleForm") .list-composer input.list-name-input.full-line(type="text" value=title autofocus) diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 6fc24d4c..8c96dfba 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -1,5 +1,5 @@ template(name="swimlane") - .swimlane.js-lists + .swimlane.js-lists.js-swimlane +swimlaneHeader if isMiniScreen if currentList diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 211f84f2..9c3435d6 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -1,4 +1,43 @@ +const { calculateIndex } = Utils; + BlazeComponent.extendComponent({ + onRendered() { + const boardComponent = this.parentComponent(); + const $swimlanesDom = boardComponent.$('.js-swimlanes'); + + $swimlanesDom.sortable({ + tolerance: 'pointer', + appendTo: 'body', + helper: 'clone', + handle: '.js-swimlane-header', + items: '.js-swimlane:not(.placeholder)', + placeholder: 'swimlane placeholder', + distance: 7, + start(evt, ui) { + ui.placeholder.height(ui.helper.height()); + EscapeActions.executeUpTo('popup-close'); + boardComponent.setIsDragging(true); + }, + stop(evt, ui) { + // To attribute the new index number, we need to get the DOM element + // of the previous and the following card -- if any. + const prevSwimlaneDom = ui.item.prev('.js-swimlane').get(0); + const nextSwimlaneDom = ui.item.next('.js-swimlane').get(0); + const sortIndex = calculateIndex(prevSwimlaneDom, nextSwimlaneDom, 1); + + $swimlanesDom.sortable('cancel'); + const swimlaneDomElement = ui.item.get(0); + const swimlane = Blaze.getData(swimlaneDomElement); + + console.log(swimlane._id); + Swimlanes.update(swimlane._id, { + $set: { + sort: sortIndex.base, + }, + }); + }, + }); + }, onCreated() { this.draggingActive = new ReactiveVar(false); diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 8f43ef58..13257953 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -1,25 +1,52 @@ @import 'nib' -.swimlane-header-wrap - display: flex; - flex-direction: row; - flex: 0 0 50px; - padding-bottom: 30px; +.swimlane + // Even if this background color is the same as the body we can't leave it + // transparent, because that won't work during a swimlane drag. + background: darken(white, 13%) + border-bottom: 1px solid #CCC + display: flex + flex-direction: row + margin: 0 0 10px + padding: 0 40px 5px 0 + overflow-x: auto + overflow-y: hidden - .swimlane-header - writing-mode: sideways-lr; - font-size: 14px; - line-height: 50px; - margin-top: 50px; - font-weight: bold; - min-height: 9px; - min-width: 30px; - overflow: hidden; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; - word-wrap: break-word; - text-align: center; + &.placeholder + background-color: rgba(0, 0, 0, .2) + border-color: transparent + box-shadow: none + height: 100px - .swimlane-header-menu - position: absolute - padding: 20px 20px + &.ui-sortable-helper + box-shadow: -2px 2px 8px rgba(0, 0, 0, .3), + 0 0 1px rgba(0, 0, 0, .5) + transform: rotate(2deg) + cursor: grabbing + + .swimlane-header.ui-sortable-handle + cursor: grabbing + + .swimlane-header-wrap + display: flex; + flex-direction: row; + flex: 0 0 50px; + padding-bottom: 30px; + + .swimlane-header + writing-mode: sideways-lr; + font-size: 14px; + line-height: 50px; + margin-top: 50px; + font-weight: bold; + min-height: 9px; + min-width: 30px; + overflow: hidden; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + word-wrap: break-word; + text-align: center; + + .swimlane-header-menu + position: absolute + padding: 20px 20px -- cgit v1.2.3-1-g7c22 From bd239351fd70f7bc40fabc4f715bdb90a79b53f5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 28 Feb 2018 09:07:42 +0200 Subject: Update translations. --- i18n/bg.i18n.json | 188 +++++++++++++++++++++++++++--------------------------- i18n/ca.i18n.json | 84 ++++++++++++------------ i18n/de.i18n.json | 4 +- i18n/fr.i18n.json | 4 +- 4 files changed, 140 insertions(+), 140 deletions(-) diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 310a1ccc..d4da0a86 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -26,40 +26,40 @@ "actions": "Actions", "activities": "Activities", "activity": "Activity", - "activity-added": "added %s to %s", - "activity-archived": "archived %s", - "activity-attached": "attached %s to %s", - "activity-created": "created %s", - "activity-excluded": "excluded %s from %s", - "activity-imported": "imported %s into %s from %s", - "activity-imported-board": "imported %s from %s", + "activity-added": "добави %s към %s", + "activity-archived": "архивира %s", + "activity-attached": "прикачи %s към %s", + "activity-created": "създаде %s", + "activity-excluded": "изключи %s от %s", + "activity-imported": "импортира %s в/във %s от %s", + "activity-imported-board": "импортира %s от %s", "activity-joined": "joined %s", - "activity-moved": "moved %s from %s to %s", + "activity-moved": "премести %s от %s в/във %s", "activity-on": "на %s", - "activity-removed": "removed %s from %s", - "activity-sent": "sent %s to %s", + "activity-removed": "премахна %s от %s", + "activity-sent": "изпрати %s до %s", "activity-unjoined": "unjoined %s", - "activity-checklist-added": "added checklist to %s", - "activity-checklist-item-added": "added checklist item to '%s' in %s", - "add": "Add", - "add-attachment": "Add Attachment", - "add-board": "Add Board", - "add-card": "Add Card", - "add-swimlane": "Add Swimlane", - "add-checklist": "Add Checklist", - "add-checklist-item": "Add an item to checklist", - "add-cover": "Add Cover", - "add-label": "Add Label", - "add-list": "Add List", + "activity-checklist-added": "добави списък със задачи към %s", + "activity-checklist-item-added": "добави точка към '%s' в/във %s", + "add": "Добави", + "add-attachment": "Добави прикачен файл", + "add-board": "Добави дъска", + "add-card": "Добави карта", + "add-swimlane": "Добави коридор", + "add-checklist": "Добави списък със задачи", + "add-checklist-item": "Добави точка към списъка със задачи", + "add-cover": "Добави корица", + "add-label": "Добави етикет", + "add-list": "Добави списък", "add-members": "Добави членове", - "added": "Added", + "added": "Добавено", "addMemberPopup-title": "Членове", "admin": "Администратор", "admin-desc": "Can view and edit cards, remove members, and change settings for the board.", "admin-announcement": "Съобщение", "admin-announcement-active": "Active System-Wide Announcement", "admin-announcement-title": "Announcement from Administrator", - "all-boards": "All boards", + "all-boards": "Всички дъски", "and-n-other-card": "And __count__ other card", "and-n-other-card_plural": "And __count__ other cards", "apply": "Apply", @@ -76,18 +76,18 @@ "archived-boards": "Archived Boards", "restore-board": "Restore Board", "no-archived-boards": "No Archived Boards.", - "archives": "Archives", + "archives": "Архиви", "assign-member": "Assign member", - "attached": "attached", - "attachment": "Attachment", + "attached": "прикачен", + "attachment": "Прикаченн файл", "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.", - "attachmentDeletePopup-title": "Delete Attachment?", - "attachments": "Attachments", + "attachmentDeletePopup-title": "Желаете ли да изтриете прикачения файл?", + "attachments": "Прикачени файлове", "auto-watch": "Automatically watch boards when they are created", - "avatar-too-big": "The avatar is too large (70KB max)", - "back": "Back", - "board-change-color": "Change color", - "board-nb-stars": "%s stars", + "avatar-too-big": "Аватарът е прекалено голям (максимум 70KB)", + "back": "Назад", + "board-change-color": "Промени цвета", + "board-nb-stars": "%s звезди", "board-not-found": "Board not found", "board-private-info": "This board will be private.", "board-public-info": "This board will be public.", @@ -99,11 +99,11 @@ "boards": "Дъски", "board-view": "Board View", "board-view-swimlanes": "Коридори", - "board-view-lists": "Lists", + "board-view-lists": "Списъци", "bucket-example": "Like “Bucket List” for example", "cancel": "Cancel", "card-archived": "This card is archived.", - "card-comments-title": "This card has %s comment.", + "card-comments-title": "Тази карта има %s коментар.", "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.", "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.", "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.", @@ -120,16 +120,16 @@ "cardAttachmentsPopup-title": "Attach From", "cardDeletePopup-title": "Delete Card?", "cardDetailsActionsPopup-title": "Card Actions", - "cardLabelsPopup-title": "Labels", + "cardLabelsPopup-title": "Етикети", "cardMembersPopup-title": "Членове", - "cardMorePopup-title": "More", - "cards": "Cards", + "cardMorePopup-title": "Още", + "cards": "Карти", "change": "Change", - "change-avatar": "Change Avatar", - "change-password": "Change Password", + "change-avatar": "Промени аватара", + "change-password": "Промени паролата", "change-permissions": "Change permissions", - "change-settings": "Change Settings", - "changeAvatarPopup-title": "Change Avatar", + "change-settings": "Промени настройките", + "changeAvatarPopup-title": "Промени аватара", "changeLanguagePopup-title": "Change Language", "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", @@ -247,17 +247,17 @@ "importMapMembersAddPopup-title": "Select Wekan member", "info": "Version", "initials": "Initials", - "invalid-date": "Invalid date", - "invalid-time": "Invalid time", - "invalid-user": "Invalid user", + "invalid-date": "Невалидна дата", + "invalid-time": "Невалиден час", + "invalid-user": "Невалиден потребител", "joined": "joined", "just-invited": "You are just invited to this board", "keyboard-shortcuts": "Keyboard shortcuts", - "label-create": "Create Label", + "label-create": "Създай етикет", "label-default": "%s label (default)", "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.", - "labels": "Labels", - "language": "Language", + "labels": "Етикети", + "language": "Език", "last-admin-desc": "You can’t change roles because there must be at least one admin.", "leave-board": "Leave Board", "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.", @@ -270,18 +270,18 @@ "listActionPopup-title": "List Actions", "swimlaneActionPopup-title": "Swimlane Actions", "listImportCardPopup-title": "Import a Trello card", - "listMorePopup-title": "More", - "link-list": "Link to this list", + "listMorePopup-title": "Още", + "link-list": "Връзка към този списък", "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.", "list-delete-suggest-archive": "You can archive a list to remove it from the board and preserve the activity.", - "lists": "Lists", + "lists": "Списъци", "swimlanes": "Коридори", - "log-out": "Log Out", - "log-in": "Log In", - "loginPopup-title": "Log In", + "log-out": "Изход", + "log-in": "Вход", + "loginPopup-title": "Вход", "memberMenuPopup-title": "Member Settings", "members": "Членове", - "menu": "Menu", + "menu": "Меню", "move-selection": "Move selection", "moveCardPopup-title": "Move Card", "moveCardToBottom-title": "Move to Bottom", @@ -291,8 +291,8 @@ "multi-selection-on": "Multi-Selection is on", "muted": "Muted", "muted-info": "You will never be notified of any changes in this board", - "my-boards": "My Boards", - "name": "Name", + "my-boards": "Моите дъски", + "name": "Име", "no-archived-cards": "No archived cards.", "no-archived-lists": "No archived lists.", "no-archived-swimlanes": "No archived swimlanes.", @@ -306,7 +306,7 @@ "or": "or", "page-maybe-private": "This page may be private. You may be able to view it by logging in.", "page-not-found": "Page not found.", - "password": "Password", + "password": "Парола", "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)", "participating": "Participating", "preview": "Preview", @@ -314,7 +314,7 @@ "previewClipboardImagePopup-title": "Preview", "private": "Private", "private-desc": "This board is private. Only people added to the board can view and edit it.", - "profile": "Profile", + "profile": "Профил", "public": "Public", "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.", "quick-access-description": "Star a board to add a shortcut in this bar.", @@ -328,12 +328,12 @@ "removeMemberPopup-title": "Remove Member?", "rename": "Rename", "rename-board": "Rename Board", - "restore": "Restore", - "save": "Save", - "search": "Search", + "restore": "Възстанови", + "save": "Запази", + "search": "Търсене", "search-cards": "Search from card titles and descriptions on this board", "search-example": "Text to search for?", - "select-color": "Select Color", + "select-color": "Избери цвят", "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list", "setWipLimitPopup-title": "Set WIP Limit", "shortcut-assign-self": "Assign yourself to current card", @@ -341,7 +341,7 @@ "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", - "shortcut-filter-my-cards": "Filter my cards", + "shortcut-filter-my-cards": "Филтрирай моите карти", "shortcut-show-shortcuts": "Bring up this shortcuts list", "shortcut-toggle-filterbar": "Toggle Filter Sidebar", "shortcut-toggle-sidebar": "Toggle Board Sidebar", @@ -371,7 +371,7 @@ "upload": "Upload", "upload-avatar": "Upload an avatar", "uploaded-avatar": "Uploaded an avatar", - "username": "Username", + "username": "Потребителско име", "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "watch": "Watch", @@ -385,24 +385,24 @@ "wipLimitErrorPopup-title": "Invalid WIP Limit", "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.", "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.", - "admin-panel": "Admin Panel", - "settings": "Settings", - "people": "People", - "registration": "Registration", + "admin-panel": "Администраторски панел", + "settings": "Настройки", + "people": "Хора", + "registration": "Регистрация", "disable-self-registration": "Disable Self-Registration", - "invite": "Invite", - "invite-people": "Invite People", + "invite": "Покани", + "invite-people": "Покани хора", "to-boards": "To board(s)", - "email-addresses": "Email Addresses", + "email-addresses": "Имейл адреси", "smtp-host-description": "The address of the SMTP server that handles your emails.", "smtp-port-description": "The port your SMTP server uses for outgoing emails.", - "smtp-tls-description": "Enable TLS support for SMTP server", - "smtp-host": "SMTP Host", - "smtp-port": "SMTP Port", - "smtp-username": "Username", - "smtp-password": "Password", - "smtp-tls": "TLS support", - "send-from": "From", + "smtp-tls-description": "Разреши TLS поддръжка за SMTP сървъра", + "smtp-host": "SMTP хост", + "smtp-port": "SMTP порт", + "smtp-username": "Потребителско име", + "smtp-password": "Парола", + "smtp-tls": "TLS поддръжка", + "send-from": "От", "send-smtp-test": "Send a test email to yourself", "invitation-code": "Invitation Code", "email-invite-register-subject": "__inviter__ sent you an invitation", @@ -415,25 +415,25 @@ "outgoingWebhooksPopup-title": "Outgoing Webhooks", "new-outgoing-webhook": "New Outgoing Webhook", "no-name": "(Unknown)", - "Wekan_version": "Wekan version", - "Node_version": "Node version", - "OS_Arch": "OS Arch", - "OS_Cpus": "OS CPU Count", - "OS_Freemem": "OS Free Memory", - "OS_Loadavg": "OS Load Average", - "OS_Platform": "OS Platform", + "Wekan_version": "Версия на Wekan", + "Node_version": "Версия на Node", + "OS_Arch": "Архитектура на ОС", + "OS_Cpus": "Брой CPU ядра", + "OS_Freemem": "Свободна памет", + "OS_Loadavg": "ОС средно натоварване", + "OS_Platform": "ОС платформа", "OS_Release": "OS Release", "OS_Totalmem": "OS Total Memory", "OS_Type": "OS Type", "OS_Uptime": "OS Uptime", - "hours": "hours", - "minutes": "minutes", - "seconds": "seconds", - "yes": "Yes", - "no": "No", - "accounts": "Accounts", + "hours": "часове", + "minutes": "минути", + "seconds": "секунди", + "yes": "Да", + "no": "Не", + "accounts": "Профили", "accounts-allowEmailChange": "Allow Email Change", - "createdAt": "Created at", + "createdAt": "Създаден на", "verified": "Verified", - "active": "Active" + "active": "Активен" } \ No newline at end of file diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index f14d0915..bf3f7a03 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -12,7 +12,7 @@ "act-archivedBoard": "__board__ arxivat", "act-archivedCard": "__card__ arxivat/da", "act-archivedList": "__list__ arxivat/da", - "act-archivedSwimlane": "archived __swimlane__", + "act-archivedSwimlane": "arxivada __swimlane__", "act-importBoard": "__board__ importat", "act-importCard": "__card__ importat", "act-importList": "__list__ importat", @@ -40,12 +40,12 @@ "activity-sent": "ha enviat %s %s", "activity-unjoined": "desassignat %s", "activity-checklist-added": "Checklist afegida a %s", - "activity-checklist-item-added": "\nafegit checklist item de'%s' a %s", + "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s", "add": "Afegeix", "add-attachment": "Afegeix adjunt", "add-board": "Afegeix Tauler", "add-card": "Afegeix fitxa", - "add-swimlane": "Add Swimlane", + "add-swimlane": "Afegix Carril de Natació", "add-checklist": "Afegeix checklist", "add-checklist-item": "Afegeix un ítem", "add-cover": "Afegeix coberta", @@ -56,9 +56,9 @@ "addMemberPopup-title": "Membres", "admin": "Administrador", "admin-desc": "Pots veure i editar fitxes, eliminar membres, i canviar la configuració del tauler", - "admin-announcement": "Announcement", - "admin-announcement-active": "Active System-Wide Announcement", - "admin-announcement-title": "Announcement from Administrator", + "admin-announcement": "Bàndol", + "admin-announcement-active": "Activar bàndol del Sistema", + "admin-announcement-title": "Bàndol de l'administració", "all-boards": "Tots els taulers", "and-n-other-card": "And __count__ other card", "and-n-other-card_plural": "And __count__ other cards", @@ -69,7 +69,7 @@ "archive-board": "Arxiva tauler", "archive-card": "Arxiva fitxa", "archive-list": "Arxiva llista", - "archive-swimlane": "Archive Swimlane", + "archive-swimlane": "Arxiva Carril de Natació", "archive-selection": "Arxiva selecció", "archiveBoardPopup-title": "Arxivar el tauler?", "archived-items": "Elements arxivats", @@ -97,8 +97,8 @@ "boardChangeWatchPopup-title": "Canvia seguiment", "boardMenuPopup-title": "Menú del tauler", "boards": "Taulers", - "board-view": "Board View", - "board-view-swimlanes": "Swimlanes", + "board-view": "Visió del tauler", + "board-view-swimlanes": "Carrils de Natació", "board-view-lists": "Llistes", "bucket-example": "Igual que “Bucket List”, per exemple", "cancel": "Cancel·la", @@ -109,7 +109,7 @@ "card-delete-suggest-archive": "Podeu arxivar una fitxa per extreure-la del tauler i preservar l'activitat.", "card-due": "Finalitza", "card-due-on": "Finalitza a", - "card-spent": "Spent Time", + "card-spent": "Temps Dedicat", "card-edit-attachments": "Edita arxius adjunts", "card-edit-labels": "Edita etiquetes", "card-edit-members": "Edita membres", @@ -160,8 +160,8 @@ "copy-card-link-to-clipboard": "Copia l'enllaç de la ftixa al porta-retalls", "copyCardPopup-title": "Copia la fitxa", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", - "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format", - "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]", + "copyChecklistToManyCardsPopup-instructions": "Títols de fitxa i Descripcions de destí en aquest format JSON", + "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Títol de la primera fitxa\", \"description\":\"Descripció de la primera fitxa\"}, {\"title\":\"Títol de la segona fitxa\",\"description\":\"Descripció de la segona fitxa\"},{\"title\":\"Títol de l'última fitxa\",\"description\":\"Descripció de l'última fitxa\"} ]", "create": "Crea", "createBoardPopup-title": "Crea tauler", "chooseBoardSourcePopup-title": "Importa Tauler", @@ -181,11 +181,11 @@ "edit": "Edita", "edit-avatar": "Canvia Avatar", "edit-profile": "Edita el teu Perfil", - "edit-wip-limit": "Edit WIP Limit", + "edit-wip-limit": "Edita el Límit de Treball en Progrès", "soft-wip-limit": "Soft WIP Limit", "editCardStartDatePopup-title": "Canvia data d'inici", "editCardDueDatePopup-title": "Canvia data de finalització", - "editCardSpentTimePopup-title": "Change spent time", + "editCardSpentTimePopup-title": "Canvia temps dedicat", "editLabelPopup-title": "Canvia etiqueta", "editNotificationPopup-title": "Edita la notificació", "editProfilePopup-title": "Edita teu Perfil", @@ -193,7 +193,7 @@ "email-enrollAccount-subject": "An account created for you on __siteName__", "email-enrollAccount-text": "Hola __user__,\n\nPer començar a utilitzar el servei, segueix l'enllaç següent.\n\n__url__\n\nGràcies.", "email-fail": "Error enviant el correu", - "email-fail-text": "Error trying to send email", + "email-fail-text": "Error en intentar enviar e-mail", "email-invalid": "Adreça de correu invàlida", "email-invite": "Convida mitjançant correu electrònic", "email-invite-subject": "__inviter__ t'ha convidat", @@ -203,7 +203,7 @@ "email-sent": "Correu enviat", "email-verifyEmail-subject": "Verify your email address on __siteName__", "email-verifyEmail-text": "Hola __user__, \n\n per verificar el teu correu, segueix l'enllaç següent.\n\n __url__\n\n Gràcies.", - "enable-wip-limit": "Enable WIP Limit", + "enable-wip-limit": "Activa e Límit de Treball en Progrès", "error-board-doesNotExist": "Aquest tauler no existeix", "error-board-notAdmin": "Necessites ser administrador d'aquest tauler per dur a lloc aquest acció", "error-board-notAMember": "Necessites ser membre d'aquest tauler per dur a terme aquesta acció", @@ -214,7 +214,7 @@ "error-user-notAllowSelf": "No et pots convidar a tu mateix", "error-user-notCreated": "L'usuari no s'ha creat", "error-username-taken": "Aquest usuari ja existeix", - "error-email-taken": "Email has already been taken", + "error-email-taken": "L'adreça de correu electrònic ja és en ús", "export-board": "Exporta tauler", "filter": "Filtre", "filter-cards": "Fitxes de filtre", @@ -249,7 +249,7 @@ "initials": "Inicials", "invalid-date": "Data invàlida", "invalid-time": "Temps Invàlid", - "invalid-user": "Invalid user", + "invalid-user": "Usuari invàlid", "joined": "s'ha unit", "just-invited": "Has estat convidat a aquest tauler", "keyboard-shortcuts": "Dreceres de teclat", @@ -260,22 +260,22 @@ "language": "Idioma", "last-admin-desc": "No podeu canviar rols perquè ha d'haver-hi almenys un administrador.", "leave-board": "Abandona tauler", - "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.", - "leaveBoardPopup-title": "Leave Board ?", + "leave-board-pop": "De debò voleu abandonar __boardTitle__? Se us eliminarà de totes les fitxes d'aquest tauler.", + "leaveBoardPopup-title": "Abandonar Tauler?", "link-card": "Enllaç a aquesta fitxa", "list-archive-cards": "Arxiva totes les fitxes d'aquesta llista", "list-archive-cards-pop": "Això eliminarà totes les fitxes d'aquesta llista del tauler. Per veure les fitxes arxivades i recuperar-les en el tauler, feu clic a \" Menú \"/ \" Articles Arxivat \".", "list-move-cards": "Mou totes les fitxes d'aquesta llista", "list-select-cards": "Selecciona totes les fitxes d'aquesta llista", "listActionPopup-title": "Accions de la llista", - "swimlaneActionPopup-title": "Swimlane Actions", + "swimlaneActionPopup-title": "Accions de Carril de Natació", "listImportCardPopup-title": "importa una fitxa de Trello", "listMorePopup-title": "Més", "link-list": "Enllaça a aquesta llista", "list-delete-pop": "Totes les accions seran esborrades de la llista d'activitats i no serà possible recuperar la llista", "list-delete-suggest-archive": "Pots arxivar una llista per eliminar-la del tauler i preservar la seva activitat", "lists": "Llistes", - "swimlanes": "Swimlanes", + "swimlanes": "Carrils de Natació", "log-out": "Finalitza la sessió", "log-in": "Ingresa", "loginPopup-title": "Inicia sessió", @@ -295,7 +295,7 @@ "name": "Nom", "no-archived-cards": "No hi ha fitxes arxivades.", "no-archived-lists": "No hi ha llistes arxivades.", - "no-archived-swimlanes": "No archived swimlanes.", + "no-archived-swimlanes": "Cap Carril de Natació arxivat", "no-results": "Sense resultats", "normal": "Normal", "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.", @@ -331,11 +331,11 @@ "restore": "Restaura", "save": "Desa", "search": "Cerca", - "search-cards": "Search from card titles and descriptions on this board", - "search-example": "Text to search for?", + "search-cards": "Cerca títols de fitxa i descripcions en aquest tauler", + "search-example": "Text que cercar?", "select-color": "Selecciona color", - "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list", - "setWipLimitPopup-title": "Set WIP Limit", + "set-wip-limit-value": "Limita el màxim nombre de tasques en aquesta llista", + "setWipLimitPopup-title": "Configura el Límit de Treball en Progrès", "shortcut-assign-self": "Assigna't la ftixa actual", "shortcut-autocomplete-emoji": "Autocompleta emoji", "shortcut-autocomplete-members": "Autocompleta membres", @@ -356,11 +356,11 @@ "team": "Equip", "this-board": "aquest tauler", "this-card": "aquesta fitxa", - "spent-time-hours": "Spent time (hours)", - "overtime-hours": "Overtime (hours)", - "overtime": "Overtime", - "has-overtime-cards": "Has overtime cards", - "has-spenttime-cards": "Has spent time cards", + "spent-time-hours": "Temps dedicat (hores)", + "overtime-hours": "Temps de més (hores)", + "overtime": "Temps de més", + "has-overtime-cards": "Té fitxes amb temps de més", + "has-spenttime-cards": "Té fitxes amb temps dedicat", "time": "Hora", "title": "Títol", "tracking": "En seguiment", @@ -378,13 +378,13 @@ "watching": "En observació", "watching-info": "Seràs notificat de cada canvi en aquest tauler", "welcome-board": "Tauler de benvinguda", - "welcome-swimlane": "Milestone 1", + "welcome-swimlane": "Objectiu 1", "welcome-list1": "Bàsics", "welcome-list2": "Avançades", "what-to-do": "Què vols fer?", - "wipLimitErrorPopup-title": "Invalid WIP Limit", - "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.", - "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.", + "wipLimitErrorPopup-title": "Límit de Treball en Progrès invàlid", + "wipLimitErrorPopup-dialog-pt1": "El nombre de tasques en esta llista és superior al límit de Treball en Progrès que heu definit.", + "wipLimitErrorPopup-dialog-pt2": "Si us plau mogui algunes taques fora d'aquesta llista, o configuri un límit de Treball en Progrès superior.", "admin-panel": "Tauler d'administració", "settings": "Configuració", "people": "Persones", @@ -403,17 +403,17 @@ "smtp-password": "Contrasenya", "smtp-tls": "Suport TLS", "send-from": "De", - "send-smtp-test": "Send a test email to yourself", + "send-smtp-test": "Envia't un correu electrònic de prova", "invitation-code": "Codi d'invitació", "email-invite-register-subject": "__inviter__ t'ha convidat", "email-invite-register-text": " __user__,\n\n __inviter__ us ha convidat a col·laborar a Wekan.\n\n Clicau l'enllaç següent per acceptar l'invitació:\n __url__\n\n El vostre codi d'invitació és: __icode__\n\n Gràcies", - "email-smtp-test-subject": "SMTP Test Email From Wekan", - "email-smtp-test-text": "You have successfully sent an email", + "email-smtp-test-subject": "Correu de Prova SMTP de Wekan", + "email-smtp-test-text": "Has enviat un missatge satisfactòriament", "error-invitation-code-not-exist": "El codi d'invitació no existeix", "error-notAuthorized": "No estau autoritzats per veure aquesta pàgina", - "outgoing-webhooks": "Outgoing Webhooks", - "outgoingWebhooksPopup-title": "Outgoing Webhooks", - "new-outgoing-webhook": "New Outgoing Webhook", + "outgoing-webhooks": "Webhooks sortints", + "outgoingWebhooksPopup-title": "Webhooks sortints", + "new-outgoing-webhook": "Nou Webook sortint", "no-name": "Importa tauler des de Wekan", "Wekan_version": "Versió Wekan", "Node_version": "Versió Node", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 7853b07c..d275e4be 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -331,8 +331,8 @@ "restore": "Wiederherstellen", "save": "Speichern", "search": "Suchen", - "search-cards": "Search from card titles and descriptions on this board", - "search-example": "Text to search for?", + "search-cards": "Suche nach Kartentiteln und Beschreibungen auf diesem Board", + "search-example": "Suchbegriff", "select-color": "Farbe auswählen", "set-wip-limit-value": "Setzen Sie ein Limit für die maximale Anzahl von Aufgaben in dieser Liste", "setWipLimitPopup-title": "WIP-Limit setzen", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 64d255a6..1fbe1867 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -331,8 +331,8 @@ "restore": "Restaurer", "save": "Enregistrer", "search": "Chercher", - "search-cards": "Search from card titles and descriptions on this board", - "search-example": "Text to search for?", + "search-cards": "Rechercher parmi les titres et descriptions des cartes de ce tableau", + "search-example": "Texte à rechercher ?", "select-color": "Sélectionner une couleur", "set-wip-limit-value": "Définit une limite maximale au nombre de cartes de cette liste", "setWipLimitPopup-title": "Définir la limite WIP", -- cgit v1.2.3-1-g7c22 From 284fac043b419de1a02edb6a7ec4cd9d49d7cce9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 28 Feb 2018 10:30:05 +0200 Subject: - Allow swimlanes reordering - Avoid swimlane title overlap Thanks to andresmanelli ! Related #955. Closes #1487 --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4eab854..d3e10693 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,11 @@ This release fixes the following bugs: - [Fix lint errors related to sandstorm](https://github.com/wekan/wekan/commit/0a16147470246c8f49bb918f5ddc7bb2e54fba14); - [Add Swimlanes to globals](https://github.com/wekan/wekan/commit/373e9782dcf87a9c1169b5d1f8175ce14e4898c9); - [Fix lint errors related to trello creator](https://github.com/wekan/wekan/commit/951a0db380d60f3d948ae38d50b85a54983a51de); -- [Fix lint errors related to language names](https://github.com/wekan/wekan/commit/c0d33d97f2c8d4e9371a03d4ad3022df3ed64d3d). +- [Fix lint errors related to language names](https://github.com/wekan/wekan/commit/c0d33d97f2c8d4e9371a03d4ad3022df3ed64d3d); +- [Allow swimlanes reordering](https://github.com/wekan/wekan/commit/37c94622e476f50bf2387bc8b140454d66200e78); +- [Avoid swimlane title overlap](https://github.com/wekan/wekan/commit/c4fa9010f34966b633c7bf7e46ad49fc101127c9). -Thanks to GitHub user GhassenRjab for contributions. +Thanks to GitHub users andresmanelli and GhassenRjab for their contributions. # v0.77 2018-02-23 Wekan release -- cgit v1.2.3-1-g7c22